From 0b1a9e148230cc6b094b927a82296bf09f5392f8 Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Fri, 13 Aug 2004 13:50:04 +0000 Subject: [PATCH] Changed un_attach logging --- ChangeLog | 2 ++ lib/attach.c | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index c16a363e..98f91ba9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,8 @@ v0.61.4 11-Aug-2004 Echomail received from not connected nodes is stored in the badmail area unless the area allowes it. Can now send (hopefully) valid uplink requests to BBBS systems. + Removed some debug logging from un_attach, made one into a + normal logmessage. mbmsg: Fixed counter in log that should show the number of linked diff --git a/lib/attach.c b/lib/attach.c index 4117c4be..4a68ab01 100644 --- a/lib/attach.c +++ b/lib/attach.c @@ -169,7 +169,7 @@ int check_flo(faddr *node, char *filename, char flavor) ticfile = calloc(PATH_MAX, sizeof(char)); sprintf(flofile, "%s", floname(node, flavor)); - Syslog('p', "%s", flofile); + Syslog('p', "check_flo: %s", flofile); if ((fp = fopen(flofile, "r+"))) { filepos = 0; while (fgets(buf, PATH_MAX +2, fp)) { @@ -177,9 +177,7 @@ int check_flo(faddr *node, char *filename, char flavor) Striplf(buf); if (buf[strlen(buf)-1] == '\r') buf[strlen(buf)-1] = '\0'; - Syslog('p', "hlo: \"%s\"", printable(buf, 0)); if (((strcmp(buf, filename) == 0) || (strcmp(buf+1, filename) == 0)) && (buf[0] != '~')) { - Syslog('p', "Found"); fseek(fp, filepos, SEEK_SET); fwrite(&tpl, 1, 1, fp); fflush(fp); @@ -194,12 +192,13 @@ int check_flo(faddr *node, char *filename, char flavor) fseek(fp, filepos, SEEK_SET); fwrite(&tpl, 1, 1, fp); fflush(fp); - Syslog('p', "Removed old %s and %s for %s", basename(filename), basename(buf+1), ascfnode(node, 0x1f)); + Syslog('+', "Removed old %s and %s for %s from outbound", + basename(filename), basename(buf+1), ascfnode(node, 0x1f)); } else { - Syslog('p', "Removed old %s for %s", basename(filename), ascfnode(node, 0x1f)); + Syslog('+', "Removed old %s for %s from outbound", basename(filename), ascfnode(node, 0x1f)); } } else { - Syslog('p', "Removed old %s for %s", basename(filename), ascfnode(node, 0x1f)); + Syslog('+', "Removed old %s for %s from outbound", basename(filename), ascfnode(node, 0x1f)); } rc = 1; break; @@ -225,7 +224,7 @@ void un_attach(faddr *node, char *filename) { char *base, *allname; - Syslog('p', "un_attach: %s %s %s", ascfnode(node, 0x1f), filename); + Syslog('p', "un_attach: %s %s", ascfnode(node, 0x1f), filename); allname = xstrcpy(filename); base = basename(allname); @@ -234,7 +233,6 @@ void un_attach(faddr *node, char *filename) (strncasecmp(base+8,".we",3) == 0) || (strncasecmp(base+8,".th",3) == 0) || (strncasecmp(base+8,".fr",3) == 0) || (strncasecmp(base+8,".sa",3) == 0) || (strncasecmp(base+8,".tic",4) == 0))) { - Syslog('p', "this is arcmail or tic, no un_attach"); free(allname); return; }