projects
/
brisk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fda5772
)
all log_mop call substituted with other log functions
author
Matteo Nastasi (mop)
<nastasi@alternativeoutput.com>
Thu, 1 Dec 2011 09:10:14 +0000
(10:10 +0100)
committer
Matteo Nastasi (mop)
<nastasi@alternativeoutput.com>
Thu, 1 Dec 2011 09:10:14 +0000
(10:10 +0100)
web/Obj/brisk.phh
patch
|
blob
|
history
web/Obj/dbase_pgsql.phh
patch
|
blob
|
history
web/briskin5/index_rd.php
patch
|
blob
|
history
web/briskin5/index_wr.php
patch
|
blob
|
history
web/index_rd.php
patch
|
blob
|
history
web/index_wr.php
patch
|
blob
|
history
diff --git
a/web/Obj/brisk.phh
b/web/Obj/brisk.phh
index
89385a2
..
6da86a8
100644
(file)
--- a/
web/Obj/brisk.phh
+++ b/
web/Obj/brisk.phh
@@
-74,7
+74,7
@@
define(DBG_LMOP, 0x0800);
define(DBG_TRAC, 0x1000);
define(DBG_SHME, 0x2000);
// NOTE: BRISK DEBUG must be a numerical constant, not the result of operations on symbols
define(DBG_TRAC, 0x1000);
define(DBG_SHME, 0x2000);
// NOTE: BRISK DEBUG must be a numerical constant, not the result of operations on symbols
-define(BRISK_DEBUG, 0x
ffffffbf
);
+define(BRISK_DEBUG, 0x
0800
);
define(BRISK_SINGLE_DEBUG,0);
define(BRISK_SINGLE_SESS, "");
define(BRISK_SINGLE_DEBUG,0);
define(BRISK_SINGLE_SESS, "");
diff --git
a/web/Obj/dbase_pgsql.phh
b/web/Obj/dbase_pgsql.phh
index
1a05b70
..
1647617
100644
(file)
--- a/
web/Obj/dbase_pgsql.phh
+++ b/
web/Obj/dbase_pgsql.phh
@@
-55,7
+55,7
@@
class DBConn
}
$out = new DBConn();
}
$out = new DBConn();
-
+
return $out;
}
function db()
return $out;
}
function db()
@@
-84,8
+84,9
@@
class BriskDB
log_main("BriskDB create:start");
do {
log_main("BriskDB create:start");
do {
- if (($dbconn = DBConn::create()) == FALSE)
+ if (($dbconn = DBConn::create()) == FALSE)
{
break;
break;
+ }
$ret = new BriskDB($dbconn);
} while (0);
$ret = new BriskDB($dbconn);
} while (0);
diff --git
a/web/briskin5/index_rd.php
b/web/briskin5/index_rd.php
index
cdb448e
..
a571704
100644
(file)
--- a/
web/briskin5/index_rd.php
+++ b/
web/briskin5/index_rd.php
@@
-337,7
+337,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
$new_step = $user->step;
} while (0);
$new_step = $user->step;
} while (0);
- log_
mop
($user->step, 'bin::index_rd.php: after ret set');
+ log_
rd2
($user->step, 'bin::index_rd.php: after ret set');
if ($user->the_end == TRUE) {
log_rd2("LOGOUT BYE BYE!!");
if ($user->the_end == TRUE) {
log_rd2("LOGOUT BYE BYE!!");
@@
-424,7
+424,7
@@
for ($i = 0 ; time() < $endtime ; $i++) {
echo ' @END@';
log_send("EXT_STEP: ".$ext_step." ENDTIME: [".$endtime."] ".$ret);
mop_flush();
echo ' @END@';
log_send("EXT_STEP: ".$ext_step." ENDTIME: [".$endtime."] ".$ret);
mop_flush();
- log_
mop
(0, 'bin::index_rd.php: after mop_flush (begin: '.sprintf("%f", $pre_main).')');
+ log_
rd2
(0, 'bin::index_rd.php: after mop_flush (begin: '.sprintf("%f", $pre_main).')');
if ($is_page_streaming)
break;
}
if ($is_page_streaming)
break;
}
diff --git
a/web/briskin5/index_wr.php
b/web/briskin5/index_wr.php
index
1eabe2c
..
e755965
100644
(file)
--- a/
web/briskin5/index_wr.php
+++ b/
web/briskin5/index_wr.php
@@
-50,7
+50,7
@@
log_wr('COMM: '.$mesg);
if ($table_idx < 0 || $table_idx >= TABLE_N)
exit;
if ($table_idx < 0 || $table_idx >= TABLE_N)
exit;
-log_
mop
(0, 'bin::index_wr.php: COMM: '.xcapemesg($mesg));
+log_
wr
(0, 'bin::index_wr.php: COMM: '.xcapemesg($mesg));
$sem = Bin5::lock_data(TRUE, $table_idx);
$sem = Bin5::lock_data(TRUE, $table_idx);
@@
-70,7
+70,7
@@
if (($user = &$bri->get_user($sess, &$idx)) == FALSE) {
$argz = explode('|', $mesg);
log_wr('POSTSPLIT: '.$argz[0].' user->stat: ['.$user->stat.']');
$argz = explode('|', $mesg);
log_wr('POSTSPLIT: '.$argz[0].' user->stat: ['.$user->stat.']');
-log_
mop
($user->step, 'bin::index_wr.php: after get_user()');
+log_
wr
($user->step, 'bin::index_wr.php: after get_user()');
if (false && $argz[0] == 'shutdown') {
log_auth($user_cur->sess, "Shutdown session. delegate to room gc the autologout");
if (false && $argz[0] == 'shutdown') {
log_auth($user_cur->sess, "Shutdown session. delegate to room gc the autologout");
@@
-534,7
+534,7
@@
else if ($user->stat == 'table') {
}
log_wr("before save data");
Bin5::save_data($bri);
}
log_wr("before save data");
Bin5::save_data($bri);
-log_
mop
($user->step, 'bin::index_wr.php: after save_data()');
+log_
wr
($user->step, 'bin::index_wr.php: after save_data()');
Bin5::unlock_data($sem);
exit;
Bin5::unlock_data($sem);
exit;
diff --git
a/web/index_rd.php
b/web/index_rd.php
index
4f06af3
..
6e3e19d
100644
(file)
--- a/
web/index_rd.php
+++ b/
web/index_rd.php
@@
-383,7
+383,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
$new_step = $user->step;
} while (0);
$new_step = $user->step;
} while (0);
- log_
mop
($user->step, 'index_rd.php: after ret set');
+ log_
rd2
($user->step, 'index_rd.php: after ret set');
if ($user->the_end == TRUE) {
Room::unlock_data($sem);
if ($user->the_end == TRUE) {
Room::unlock_data($sem);
@@
-473,7
+473,7
@@
for ($i = 0 ; time() < $endtime ; $i++) {
echo ' @END@';
log_send("IS_PAGE: ".($is_page_streaming == TRUE ? "TRUE" : "FALSE")."EXT_STEP: ".$ext_step." ENDTIME: [".$endtime."] ".$ret);
mop_flush();
echo ' @END@';
log_send("IS_PAGE: ".($is_page_streaming == TRUE ? "TRUE" : "FALSE")."EXT_STEP: ".$ext_step." ENDTIME: [".$endtime."] ".$ret);
mop_flush();
- log_
mop
(0, 'index_rd.php: after mop_flush (begin: '.sprintf("%f", $pre_main).')');
+ log_
rd2
(0, 'index_rd.php: after mop_flush (begin: '.sprintf("%f", $pre_main).')');
if ($is_page_streaming)
break;
}
if ($is_page_streaming)
break;
}
diff --git
a/web/index_wr.php
b/web/index_wr.php
index
c1fbcff
..
5141092
100644
(file)
--- a/
web/index_wr.php
+++ b/
web/index_wr.php
@@
-100,7
+100,7
@@
if (array_search($_SERVER['REMOTE_ADDR'], $G_black_list) !== FALSE) {
$is_spawn = FALSE;
$is_spawn = FALSE;
-log_
mop
(0, 'index_wr.php: COMM: '.xcapemesg($mesg));
+log_
wr
(0, 'index_wr.php: COMM: '.xcapemesg($mesg));
log_wr('COMM: '.xcapemesg($mesg));
$curtime = time();
log_wr('COMM: '.xcapemesg($mesg));
$curtime = time();
@@
-186,7
+186,7
@@
$argz = explode('|', xcapemesg($mesg));
log_wr('POSTSPLIT: '.$argz[0]);
log_wr('POSTSPLIT: '.$argz[0]);
-log_
mop
($user->step, 'index_wr.php: after get_user()');
+log_
wr
($user->step, 'index_wr.php: after get_user()');
if ($argz[0] == 'shutdown') {
log_auth($user->sess, "Shutdown session.");
if ($argz[0] == 'shutdown') {
log_auth($user->sess, "Shutdown session.");
@@
-670,7
+670,7
@@
else if ($user->stat == 'room') {
}
log_wr("before save data");
Room::save_data($room);
}
log_wr("before save data");
Room::save_data($room);
-log_
mop
($user->step, 'index_wr.php: after save_data()');
+log_
wr
($user->step, 'index_wr.php: after save_data()');
Room::unlock_data($sem);
exit;
Room::unlock_data($sem);
exit;