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

Improved loggin for auto areas create

Browse Source
This commit is contained in:
Michiel Broek 2002-12-07 16:59:01 +00:00
parent f8cee18f1b
commit 51afb78b2b
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mbfido/createf.c
View File

@ -208,7 +208,6 @@ int CheckTicGroup(char *Area, int SendUplink, faddr *f)
tidy_faddr(From); tidy_faddr(From);
tidy_faddr(To); tidy_faddr(To);
} }
Syslog('f', "Netmail ready");
/* /*
* Open tic area and set filepointer to the end to append * Open tic area and set filepointer to the end to append
@ -332,7 +331,7 @@ int CheckTicGroup(char *Area, int SendUplink, faddr *f)
*/ */
sprintf(temp, "%s/fdb/fdb%ld.data", getenv("MBSE_ROOT"), AreaNr); sprintf(temp, "%s/fdb/fdb%ld.data", getenv("MBSE_ROOT"), AreaNr);
if ((fp = fopen(temp, "r+")) == NULL) { if ((fp = fopen(temp, "r+")) == NULL) {
Syslog('+', "Creating new %s", temp); Syslog('f', "Creating new %s", temp);
if ((fp = fopen(temp, "a+")) == NULL) { if ((fp = fopen(temp, "a+")) == NULL) {
WriteError("$Can't create %s", temp); WriteError("$Can't create %s", temp);
} else { } else {

24
mbfido/mgrutil.c
View File

@ -351,7 +351,7 @@ int UplinkRequest(faddr *t, faddr *From, int FileMgr, char *cmd)
} }
subj = xstrcpy(nodes.Apasswd); subj = xstrcpy(nodes.Apasswd);
Mgrlog("%s request from %s to %s", mgrname, aka2str(Orig), ascfnode(t, 0x1f)); Mgrlog("Sending uplink request from %s to \"%s\" at %s", aka2str(Orig), mgrname, ascfnode(t, 0x1f));
Now = time(NULL) - (gmt_offset((time_t)0) * 60); Now = time(NULL) - (gmt_offset((time_t)0) * 60);
flags |= (nodes.Crash) ? M_CRASH : 0; flags |= (nodes.Crash) ? M_CRASH : 0;
@ -533,7 +533,7 @@ int Areas(void)
sysconnect System; sysconnect System;
faddr *From, *To; faddr *From, *To;
Syslog('+', "Process areas taglists"); Mgrlog("Process areas taglists");
if (!do_quiet) { if (!do_quiet) {
colour(3, 0); colour(3, 0);
@ -665,15 +665,13 @@ int Areas(void)
fseek(fp, - msgshdr.recsize, SEEK_CUR); fseek(fp, - msgshdr.recsize, SEEK_CUR);
sprintf(temp, "%s.jhr", msgs.Base); sprintf(temp, "%s.jhr", msgs.Base);
if (strlen(msgs.Base) && (file_size(temp) != 1024)) { if (strlen(msgs.Base) && (file_size(temp) != 1024)) {
Mgrlog("Marking message area %d, %s read-only", Mgrlog("Marking echo %s, group %s, area %d read-only", msgs.Tag, mgroup.Name,
((ftell(fp) - msgshdr.hdrsize) / (msgshdr.recsize + msgshdr.syssize)) + 1, ((ftell(fp) - msgshdr.hdrsize) / (msgshdr.recsize + msgshdr.syssize)) + 1);
msgs.Tag);
msgs.MsgKinds = RONLY; // Area read-only msgs.MsgKinds = RONLY; // Area read-only
sprintf(msgs.Group, "DELETED"); // Make groupname invalid sprintf(msgs.Group, "DELETED"); // Make groupname invalid
} else { } else {
Mgrlog("Removing empty message area %d, %s", Mgrlog("Removing empty echo %s, group %s, area %d", msgs.Tag, mgroup.Name,
((ftell(fp) - msgshdr.hdrsize) / (msgshdr.recsize + msgshdr.syssize)) + 1, ((ftell(fp) - msgshdr.hdrsize) / (msgshdr.recsize + msgshdr.syssize)) + 1);
msgs.Tag);
memset(&msgs, 0, sizeof(msgs)); memset(&msgs, 0, sizeof(msgs));
msgs.DaysOld = CFG.defdays; msgs.DaysOld = CFG.defdays;
msgs.MaxMsgs = CFG.defmsgs; msgs.MaxMsgs = CFG.defmsgs;
@ -868,9 +866,9 @@ int Areas(void)
/* /*
* Now we have a list of actions to perform * Now we have a list of actions to perform
*/ */
Syslog('f', "Area tag Oke Del"); Syslog('F', "Area tag Oke Del");
for (tmp = alist; tmp; tmp = tmp->next) { for (tmp = alist; tmp; tmp = tmp->next) {
Syslog('f', "%-20s %s %s", tmp->Name, tmp->IsPresent?"Yes":"No ", tmp->DoDelete?"Yes":"No "); Syslog('F', "%-20s %s %s", tmp->Name, tmp->IsPresent?"Yes":"No ", tmp->DoDelete?"Yes":"No ");
} }
/* /*
@ -914,7 +912,7 @@ int Areas(void)
while (fread(&tic, tichdr.recsize, 1, fp) == 1) { while (fread(&tic, tichdr.recsize, 1, fp) == 1) {
if (tic.Active && !strcmp(tic.Group, fgroup.Name) && !strcmp(tic.Name, tmp->Name)) { if (tic.Active && !strcmp(tic.Group, fgroup.Name) && !strcmp(tic.Name, tmp->Name)) {
fseek(fp, - tichdr.recsize, SEEK_CUR); fseek(fp, - tichdr.recsize, SEEK_CUR);
Syslog('+', "Marked TIC area %s for deletion", tmp->Name); Mgrlog("Marked TIC area %s, group %s for deletion", tmp->Name, fgroup.Name);
tic.Deleted = TRUE; tic.Deleted = TRUE;
tic.Active = FALSE; tic.Active = FALSE;
fwrite(&tic, tichdr.recsize, 1, fp); fwrite(&tic, tichdr.recsize, 1, fp);
@ -963,7 +961,7 @@ int Areas(void)
fclose(ap); fclose(ap);
unlink(temp); unlink(temp);
rename(buf, temp); rename(buf, temp);
Mgrlog("Purged %d TIC records", count); Mgrlog("Purged %d TIC areas", count);
} }
} }
@ -978,7 +976,7 @@ int Areas(void)
if (UplinkRequest(To, From, TRUE, cmd)) { if (UplinkRequest(To, From, TRUE, cmd)) {
WriteError("Uplink request failed"); WriteError("Uplink request failed");
} else { } else {
Mgrlog("AreaMgr request sent to %s", aka2str(fgroup.UpLink)); Mgrlog("FileMgr request sent to %s", aka2str(fgroup.UpLink));
} }
tidy_faddr(From); tidy_faddr(From);
tidy_faddr(To); tidy_faddr(To);