bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added lockfile age check

Browse Source
This commit is contained in:
Michiel Broek 2003-07-13 13:22:32 +00:00
parent 932ce5d7a5
commit cde220ead7
3 changed files with 109 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -7,6 +7,9 @@ $Id$
v0.37.5 12-Jul-2003 v0.37.5 12-Jul-2003
common.a:
Node locking tests for non-stale lockfiles older then 6 hours.
v0.37.4 10-May-2003 - 12-Jul-2003 v0.37.4 10-May-2003 - 12-Jul-2003

11
TODO
View File

@ -1,6 +1,6 @@
$Id$ $Id$
MBSE BBS V0.37.03 TODO list. MBSE BBS V0.37.05 TODO list.
---------------------------- ----------------------------
These are a list of things that must be implemented one way or These are a list of things that must be implemented one way or
@ -106,9 +106,6 @@ mbcico:
N: Implement binkp resync when getting files. Transmit works. N: Implement binkp resync when getting files. Transmit works.
N: Add better check for stale outbound locks, check if the pid is from
a non-mbse program or add a age check.
mbfile: mbfile:
N: Add a check to see if the magic filenames are (still) valid. N: Add a check to see if the magic filenames are (still) valid.
@ -133,12 +130,6 @@ mbaff:
mbindex: mbindex:
N: Add usernames index. N: Add usernames index.
mbmon:
L: Logfile tail functions.
mbtask:
N: Add events.
mbnewusr: mbnewusr:
N: On NetBSD, supress error message from mbpasswd. N: On NetBSD, supress error message from mbpasswd.

14
lib/nodelock.c
View File

@ -4,7 +4,7 @@
* Purpose ...............: Node locking * Purpose ...............: Node locking
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2002 * Copyright (C) 1997-2003
* *
* Michiel Broek FIDO: 2:280/2802 * Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10 * Beekmansbos 10
@ -39,11 +39,11 @@
int nodelock(faddr *addr) int nodelock(faddr *addr)
{ {
char *fn,*tfn,*p; char *fn, *tfn, *p, tmp[16];
char tmp[16];
FILE *fp; FILE *fp;
pid_t pid, mypid; pid_t pid, mypid;
int tmppid, sverr; int tmppid, sverr;
time_t ltime, now;
fn = bsyname(addr); fn = bsyname(addr);
tfn = xstrcpy(fn); tfn = xstrcpy(fn);
@ -103,9 +103,17 @@ int nodelock(faddr *addr)
return 0; return 0;
} }
/*
* Stale or old lock tests
*/
ltime = file_time(fn);
now = time(NULL);
if (kill(pid, 0) && (errno == ESRCH)) { if (kill(pid, 0) && (errno == ESRCH)) {
Syslog('+', "Found stale bsy file for %s, unlink", ascfnode(addr,0x1f)); Syslog('+', "Found stale bsy file for %s, unlink", ascfnode(addr,0x1f));
unlink(fn); unlink(fn);
} else if (((unsigned long)now - (unsigned long)ltime) > 21600) {
Syslog('+', "Found lock older then 6 hours for %s, unlink", ascfnode(addr,0x1f));
unlink(fn);
} else { } else {
Syslog('+', "Node %s is locked by pid %d", ascfnode(addr, 0x1f), pid); Syslog('+', "Node %s is locked by pid %d", ascfnode(addr, 0x1f), pid);
unlink(tfn); unlink(tfn);