projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log_legal refactored and locking recovery managed
[brisk.git]
/
web
/
briskin5
/
Obj
/
briskin5.phh
diff --git
a/web/briskin5/Obj/briskin5.phh
b/web/briskin5/Obj/briskin5.phh
index
f5d5847
..
831cffd
100644
(file)
--- a/
web/briskin5/Obj/briskin5.phh
+++ b/
web/briskin5/Obj/briskin5.phh
@@
-257,13
+257,11
@@
class Briskin5 {
// exit;
// WARNING monitor this step
if (($tok = @ftok(FTOK_PATH."/table".$table_idx, "B")) == -1) {
// exit;
// WARNING monitor this step
if (($tok = @ftok(FTOK_PATH."/table".$table_idx, "B")) == -1) {
- echo "FTOK FAILED";
- exit;
+ return (FALSE);
}
// WARNING monitor this step
if (($res = @sem_get($tok)) == FALSE) {
}
// WARNING monitor this step
if (($res = @sem_get($tok)) == FALSE) {
- echo "SEM_GET FAILED";
- exit;
+ return (FALSE);
}
if (sem_acquire($res)) {
log_lock("LOCK table ".$table_idx."[res: ".$res."]");
}
if (sem_acquire($res)) {
log_lock("LOCK table ".$table_idx."[res: ".$res."]");
@@
-406,8
+404,7
@@
class Briskin5 {
$dt, $user->flags, xcape($user->name), xcape($user_mesg));
$user_cur->step_inc();
}
$dt, $user->flags, xcape($user->name), xcape($user_mesg));
$user_cur->step_inc();
}
- log_legal($curtime, $user->sess, $user->name,
- ($user->stat == 'room' ? 'room' : 'table '.$user->table),$user_mesg);
+ log_legal($curtime, $user, ($user->stat == 'room' ? 'room' : 'table '.$user->table),$user_mesg);
}
}
}
}