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

Updated mbtask and mbmsg debug messages

Browse Source
This commit is contained in:
Michiel Broek 2002-07-06 15:08:16 +00:00
parent 4f2eca7cae
commit 775b077dbc
4 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -2,7 +2,10 @@ $Id$
MBSEBBS History. MBSEBBS History.
v0.35.02 22-Jun-2002 v0.35.03 06-Jul-2002
v0.35.02 22-Jun-2002 - 06-Jul-2002
upgrade: upgrade:
Delete ~/etc/lastcall.data Delete ~/etc/lastcall.data
@ -80,10 +83,14 @@ v0.35.02 22-Jun-2002
With QWK messages upload, if a tearline is already present, it With QWK messages upload, if a tearline is already present, it
will not be added again. will not be added again.
mbmsg:
The isdoing messages now has the area number included.
mbtask: mbtask:
When first run the goldnode command is only filled in if it When first run the goldnode command is only filled in if it
exists in the mbtask configuration. exists in the mbtask configuration.
Implemented nodes special outbound boxes. Implemented nodes special outbound boxes.
Added debug info for isdoing messages.
v0.35.01 05-Jun-2002 - 22-Jun-2002 v0.35.01 05-Jun-2002 - 22-Jun-2002

54
mbfido/mbmsg.c
View File

@ -296,13 +296,13 @@ void DoMsgBase()
are_tot++; are_tot++;
mkdirs(msgs.Base, 0770); mkdirs(msgs.Base, 0770);
if (do_kill) if (do_kill)
KillArea(msgs.Base, msgs.Name, msgs.DaysOld, msgs.MaxMsgs); KillArea(msgs.Base, msgs.Name, msgs.DaysOld, msgs.MaxMsgs, do_area);
if (do_pack || msg_del) if (do_pack || msg_del)
PackArea(msgs.Base); PackArea(msgs.Base, do_area);
if (do_index) if (do_index)
IndexArea(msgs.Base); IndexArea(msgs.Base, do_area);
if (do_link) if (do_link)
LinkArea(msgs.Base); LinkArea(msgs.Base, do_area);
if (processed) if (processed)
are_proc++; are_proc++;
} }
@ -327,15 +327,15 @@ void DoMsgBase()
mkdirs(msgs.Base, 0770); mkdirs(msgs.Base, 0770);
processed = FALSE; processed = FALSE;
if (do_kill) if (do_kill)
KillArea(msgs.Base, msgs.Name, msgs.DaysOld, msgs.MaxMsgs); KillArea(msgs.Base, msgs.Name, msgs.DaysOld, msgs.MaxMsgs, arearec);
if (do_pack || (Del != msg_del)) { if (do_pack || (Del != msg_del)) {
PackArea(msgs.Base); PackArea(msgs.Base, arearec);
} }
Del = msg_del; Del = msg_del;
if (do_index) if (do_index)
IndexArea(msgs.Base); IndexArea(msgs.Base, arearec);
if (do_link) if (do_link)
LinkArea(msgs.Base); LinkArea(msgs.Base, arearec);
if (processed) if (processed)
are_proc++; are_proc++;
} }
@ -364,15 +364,15 @@ void DoMsgBase()
are_tot++; are_tot++;
processed = FALSE; processed = FALSE;
if (do_kill) if (do_kill)
KillArea(sAreas, Name, 0, CFG.defmsgs); KillArea(sAreas, Name, 0, CFG.defmsgs, 0);
if (do_pack || (Del != msg_del)) { if (do_pack || (Del != msg_del)) {
PackArea(sAreas); PackArea(sAreas, 0);
} }
Del = msg_del; Del = msg_del;
if (do_index) if (do_index)
IndexArea(sAreas); IndexArea(sAreas, 0);
if (do_link) if (do_link)
LinkArea(sAreas); LinkArea(sAreas, 0);
if (processed) if (processed)
are_proc++; are_proc++;
sprintf(sAreas, "%s/%s/archive", CFG.bbs_usersdir, usrconfig.Name); sprintf(sAreas, "%s/%s/archive", CFG.bbs_usersdir, usrconfig.Name);
@ -380,14 +380,14 @@ void DoMsgBase()
are_tot++; are_tot++;
processed = FALSE; processed = FALSE;
if (do_kill) if (do_kill)
KillArea(sAreas, Name, 0, CFG.defmsgs); KillArea(sAreas, Name, 0, CFG.defmsgs, 0);
if (do_pack || (Del != msg_del)) if (do_pack || (Del != msg_del))
PackArea(sAreas); PackArea(sAreas, 0);
Del = msg_del; Del = msg_del;
if (do_index) if (do_index)
IndexArea(sAreas); IndexArea(sAreas, 0);
if (do_link) if (do_link)
LinkArea(sAreas); LinkArea(sAreas, 0);
if (processed) if (processed)
are_proc++; are_proc++;
sprintf(sAreas, "%s/%s/trash", CFG.bbs_usersdir, usrconfig.Name); sprintf(sAreas, "%s/%s/trash", CFG.bbs_usersdir, usrconfig.Name);
@ -395,14 +395,14 @@ void DoMsgBase()
are_tot++; are_tot++;
processed = FALSE; processed = FALSE;
if (do_kill) if (do_kill)
KillArea(sAreas, Name, CFG.defdays, CFG.defmsgs); KillArea(sAreas, Name, CFG.defdays, CFG.defmsgs, 0);
if (do_pack || (Del != msg_del)) if (do_pack || (Del != msg_del))
PackArea(sAreas); PackArea(sAreas, 0);
Del = msg_del; Del = msg_del;
if (do_index) if (do_index)
IndexArea(sAreas); IndexArea(sAreas, 0);
if (do_link) if (do_link)
LinkArea(sAreas); LinkArea(sAreas, 0);
if (processed) if (processed)
are_proc++; are_proc++;
@ -429,14 +429,14 @@ typedef struct {
void LinkArea(char *Path) void LinkArea(char *Path, long Areanr)
{ {
int i, m; int i, m;
unsigned long Number, Prev, Next, Crc, Total; unsigned long Number, Prev, Next, Crc, Total;
char Temp[128], *p; char Temp[128], *p;
MSGLINK *Link; MSGLINK *Link;
IsDoing("Linking"); IsDoing("Linking %ld", Areanr);
if (Msg_Open(Path)) { if (Msg_Open(Path)) {
if (!do_quiet) { if (!do_quiet) {
@ -550,13 +550,13 @@ void LinkArea(char *Path)
/* /*
* Kill messages according to age and max messages. * Kill messages according to age and max messages.
*/ */
void KillArea(char *Path, char *Name, int DaysOld, int MaxMsgs) void KillArea(char *Path, char *Name, int DaysOld, int MaxMsgs, long Areanr)
{ {
unsigned long Number, TotalMsgs = 0, Highest, *Active, Counter = 0; unsigned long Number, TotalMsgs = 0, Highest, *Active, Counter = 0;
int i, DelCount = 0, DelAge = 0, Done; int i, DelCount = 0, DelAge = 0, Done;
time_t Today, MsgDate; time_t Today, MsgDate;
IsDoing("Killing"); IsDoing("Killing %ld", Areanr);
Today = time(NULL) / 86400L; Today = time(NULL) / 86400L;
if (Msg_Open(Path)) { if (Msg_Open(Path)) {
@ -665,7 +665,7 @@ void KillArea(char *Path, char *Name, int DaysOld, int MaxMsgs)
void IndexArea(char *Path) void IndexArea(char *Path, long Areanr)
{ {
} }
@ -674,9 +674,9 @@ void IndexArea(char *Path)
/* /*
* Pack message area if there are deleted messages. * Pack message area if there are deleted messages.
*/ */
void PackArea(char *Path) void PackArea(char *Path, long Areanr)
{ {
IsDoing("Packing"); IsDoing("Packing %ld", Areanr);
if (Msg_Open(Path)) { if (Msg_Open(Path)) {
if (!do_quiet) { if (!do_quiet) {

8
mbfido/mbmsg.h
View File

@ -5,10 +5,10 @@ void ProgName(void);
void Help(void); void Help(void);
void die(int); void die(int);
void DoMsgBase(void); void DoMsgBase(void);
void PackArea(char *); void PackArea(char *, long);
void LinkArea(char *); void LinkArea(char *, long);
void IndexArea(char *); void IndexArea(char *, long);
void KillArea(char *, char *, int, int); void KillArea(char *, char *, int, int, long);
#endif #endif

3
mbtask/taskregs.c
View File

@ -199,6 +199,7 @@ int reg_doing(char *data)
return -1; return -1;
strncpy(reginfo[rec].doing, line, 35); strncpy(reginfo[rec].doing, line, 35);
tasklog('d', "%s (%s) does \"%s\"", reginfo[rec].prg, pid, line);
reginfo[rec].lastcon = time(NULL); reginfo[rec].lastcon = time(NULL);
return 0; return 0;
} }
@ -222,7 +223,7 @@ int reg_ip(char *data)
reginfo[rec].istcp = TRUE; reginfo[rec].istcp = TRUE;
reginfo[rec].lastcon = time(NULL); reginfo[rec].lastcon = time(NULL);
ipmailers++; ipmailers++;
tasklog('?', "TCP/IP session registered, now %d sessions", ipmailers); tasklog('?', "TCP/IP session registered (%s), now %d sessions", pid, ipmailers);
return 0; return 0;
} }