summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Denker <jsd@av8n.com>2014-04-27 23:09:00 (GMT)
committerJohn Denker <jsd@av8n.com>2014-04-27 23:33:32 (GMT)
commite13129817877ff8a4689b151b09a85af8a5f6359 (patch)
tree5e12f8ab8fb1ba1720ca827af1dfb2cfec496307
parent35da8253b2e133d485597b048b7c9cb4fb474444 (diff)
consistent names: Log1 Log2 Log3
-rw-r--r--qmail-send.c140
-rw-r--r--qsutil.c8
-rw-r--r--qsutil.h4
3 files changed, 76 insertions, 76 deletions
diff --git a/qmail-send.c b/qmail-send.c
index 456d416..2ab668e 100644
--- a/qmail-send.c
+++ b/qmail-send.c
@@ -69,18 +69,18 @@ int chanskip[CHANNELS] = { 10, 20 };
void del_status();
int flagexitasap = 0; void sigterm() {
- log1("Caught TERM signal; will exit ASAP.\n");
+ Log1("Caught TERM signal; will exit ASAP.\n");
del_status();
flagexitasap = 1;
}
int flagrunasap = 0; void sigalrm() { flagrunasap = 1; }
int flagreadasap = 0; void sighup() { flagreadasap = 1; }
-void cleandied() { log1("alert: oh no! lost qmail-clean connection! dying...\n");
+void cleandied() { Log1("alert: oh no! lost qmail-clean connection! dying...\n");
flagexitasap = 1; }
int flagspawnalive[CHANNELS];
-void spawndied(c) int c; { log1("alert: oh no! lost spawn connection! dying...\n");
+void spawndied(c) int c; { Log1("alert: oh no! lost spawn connection! dying...\n");
flagspawnalive[c] = 0; flagexitasap = 1; }
#define REPORTMAX 10000
@@ -380,7 +380,7 @@ void cleanup_do()
if (substdio_putflush(&sstoqc,fn.s,fn.len) == -1) { cleandied(); return; }
if (substdio_get(&ssfromqc,&ch,1) != 1) { cleandied(); return; }
if (ch != '+')
- log3("warning: qmail-clean unable to clean up ",fn.s,"\n");
+ Log3("warning: qmail-clean unable to clean up ",fn.s,"\n");
}
@@ -435,7 +435,7 @@ unsigned long id;
return;
fail:
- log3("warning: unable to stat ",fn.s,"; will try again later\n");
+ Log3("warning: unable to stat ",fn.s,"; will try again later\n");
pe.id = id; pe.dt = now() + SLEEP_SYSFAIL;
while (!prioq_insert(&pqfail,&pe)) nomem();
}
@@ -466,7 +466,7 @@ void pqfinish()
fnmake_chanaddr(pe.id,c);
ut[0] = ut[1] = pe.dt;
if (utime(fn.s,ut) == -1)
- log3("warning: unable to utime ",fn.s,"; message will be retried too soon\n");
+ Log3("warning: unable to utime ",fn.s,"; message will be retried too soon\n");
}
}
@@ -548,7 +548,7 @@ int j;
fnmake_chanaddr(jo[j].id,jo[j].channel);
if (unlink(fn.s) == -1)
{
- log3("warning: unable to unlink ",fn.s,"; will try again later\n");
+ Log3("warning: unable to unlink ",fn.s,"; will try again later\n");
pe.dt = now() + SLEEP_SYSFAIL;
}
else
@@ -560,7 +560,7 @@ int j;
if (stat(fn.s,&st) == 0) return; /* more channels going */
if (errno != error_noent)
{
- log3("warning: unable to stat ",fn.s,"\n");
+ Log3("warning: unable to stat ",fn.s,"\n");
break; /* this is the only reason for HOPEFULLY */
}
}
@@ -632,7 +632,7 @@ char *report;
{
fd = open_append(fn2.s);
if (fd != -1) break;
- log1("alert: unable to append to bounce message; HELP! sleeping...\n");
+ Log1("alert: unable to append to bounce message; HELP! sleeping...\n");
sleep(10);
}
pos = 0;
@@ -641,7 +641,7 @@ char *report;
w = write(fd,bouncetext.s + pos,bouncetext.len - pos);
if (w <= 0)
{
- log1("alert: unable to append to bounce message; HELP! sleeping...\n");
+ Log1("alert: unable to append to bounce message; HELP! sleeping...\n");
sleep(10);
}
else
@@ -683,17 +683,17 @@ unsigned long id;
{
if (errno == error_noent)
return 1;
- log3("warning: unable to stat ",fn2.s,"\n");
+ Log3("warning: unable to stat ",fn2.s,"\n");
return 0;
}
if (str_equal(sender.s,"#@[]"))
- log3("triple bounce: discarding ",fn2.s,"\n");
+ Log3("triple bounce: discarding ",fn2.s,"\n");
else if (!*sender.s && *doublebounceto.s == '@')
- log3("double bounce: discarding ",fn2.s,"\n");
+ Log3("double bounce: discarding ",fn2.s,"\n");
else
{
if (qmail_open(&qqt) == -1)
- { log1("warning: unable to start qmail-queue, will try later\n"); return 0; }
+ { Log1("warning: unable to start qmail-queue, will try later\n"); return 0; }
qp = qmail_qp(&qqt);
if (*sender.s) { bouncesender = ""; bouncerecip = sender.s; }
@@ -758,16 +758,16 @@ I tried to deliver a bounce message to this address, but the bounce bounced!\n\
qmail_from(&qqt,bouncesender);
qmail_to(&qqt,bouncerecip);
if (*qmail_close(&qqt))
- { log1("warning: trouble injecting bounce message, will try later\n"); return 0; }
+ { Log1("warning: trouble injecting bounce message, will try later\n"); return 0; }
strnum2[fmt_ulong(strnum2,id)] = 0;
Log2("bounce msg ",strnum2);
strnum2[fmt_ulong(strnum2,qp)] = 0;
- log3(" qp ",strnum2,"\n");
+ Log3(" qp ",strnum2,"\n");
}
if (unlink(fn2.s) == -1)
{
- log3("warning: unable to unlink ",fn2.s,"\n");
+ Log3("warning: unable to unlink ",fn2.s,"\n");
return 0;
}
return 1;
@@ -797,15 +797,15 @@ void del_status()
{
int c;
- log1("status:");
+ Log1("status:");
for (c = 0;c < CHANNELS;++c) {
strnum2[fmt_ulong(strnum2,(unsigned long) concurrencyused[c])] = 0;
strnum3[fmt_ulong(strnum3,(unsigned long) concurrency[c])] = 0;
Log2(chanstatusmsg[c],strnum2);
Log2("/",strnum3);
}
- if (flagexitasap) log1(" exitasap");
- log1("\n");
+ if (flagexitasap) Log1(" exitasap");
+ Log1("\n");
}
void del_init()
@@ -867,9 +867,9 @@ char *recip;
strnum2[fmt_ulong(strnum2,d[c][i].delid)] = 0;
strnum3[fmt_ulong(strnum3,jo[j].id)] = 0;
Log2("starting delivery ",strnum2);
- log3(": msg ",strnum3,tochan[c]);
+ Log3(": msg ",strnum3,tochan[c]);
logsafe(recip);
- log1("\n");
+ Log1("\n");
del_status();
}
@@ -892,7 +892,7 @@ seek_pos pos;
close(fd);
return;
}
- log3("warning: trouble marking ",fn.s,"; message will be delivered twice!\n");
+ Log3("warning: trouble marking ",fn.s,"; message will be delivered twice!\n");
}
void del_dochan(c)
@@ -917,7 +917,7 @@ int c;
{
delnum = (unsigned int) (unsigned char) dline[c].s[0];
if ((delnum < 0) || (delnum >= concurrency[c]) || !d[c][delnum].used)
- log1("warning: internal error: delivery report out of range\n");
+ Log1("warning: internal error: delivery report out of range\n");
else
{
strnum3[fmt_ulong(strnum3,d[c][delnum].delid)] = 0;
@@ -932,27 +932,27 @@ int c;
switch(dline[c].s[1])
{
case 'K':
- log3("delivery ",strnum3,": success: ");
+ Log3("delivery ",strnum3,": success: ");
logsafe(dline[c].s + 2);
- log1("\n");
+ Log1("\n");
markdone(c,jo[d[c][delnum].j].id,d[c][delnum].mpos);
--jo[d[c][delnum].j].numtodo;
break;
case 'Z':
- log3("delivery ",strnum3,": deferral: ");
+ Log3("delivery ",strnum3,": deferral: ");
logsafe(dline[c].s + 2);
- log1("\n");
+ Log1("\n");
break;
case 'D':
- log3("delivery ",strnum3,": failure: ");
+ Log3("delivery ",strnum3,": failure: ");
logsafe(dline[c].s + 2);
- log1("\n");
+ Log1("\n");
addbounce(jo[d[c][delnum].j].id,d[c][delnum].recip.s,dline[c].s + 2);
markdone(c,jo[d[c][delnum].j].id,d[c][delnum].mpos);
--jo[d[c][delnum].j].numtodo;
break;
default:
- log3("delivery ",strnum3,": report mangled, will defer\n");
+ Log3("delivery ",strnum3,": report mangled, will defer\n");
}
job_close(d[c][delnum].j);
d[c][delnum].used = 0; --concurrencyused[c];
@@ -1095,7 +1095,7 @@ int c;
if (getln(&pass[c].ss,&line,&match,'\0') == -1)
{
fnmake_chanaddr(pass[c].id,c);
- log3("warning: trouble reading ",fn.s,"; will try again later\n");
+ Log3("warning: trouble reading ",fn.s,"; will try again later\n");
close(pass[c].fd);
job_close(pass[c].j);
pass[c].id = 0;
@@ -1119,7 +1119,7 @@ int c;
break;
default:
fnmake_chanaddr(pass[c].id,c);
- log3("warning: unknown record type in ",fn.s,"!\n");
+ Log3("warning: unknown record type in ",fn.s,"!\n");
close(pass[c].fd);
job_close(pass[c].j);
pass[c].id = 0;
@@ -1130,7 +1130,7 @@ int c;
return;
trouble:
- log3("warning: trouble opening ",fn.s,"; will try again later\n");
+ Log3("warning: trouble opening ",fn.s,"; will try again later\n");
pe.dt = recent + SLEEP_SYSFAIL;
while (!prioq_insert(&pqchan[c],&pe)) nomem();
}
@@ -1149,7 +1149,7 @@ unsigned long id;
if (stat(fn.s,&st) == 0) return; /* false alarm; consequence of HOPEFULLY */
if (errno != error_noent)
{
- log3("warning: unable to stat ",fn.s,"; will try again later\n");
+ Log3("warning: unable to stat ",fn.s,"; will try again later\n");
goto fail;
}
}
@@ -1158,7 +1158,7 @@ unsigned long id;
if (stat(fn.s,&st) == 0) return;
if (errno != error_noent)
{
- log3("warning: unable to stat ",fn.s,"; will try again later\n");
+ Log3("warning: unable to stat ",fn.s,"; will try again later\n");
goto fail;
}
@@ -1166,7 +1166,7 @@ unsigned long id;
if (stat(fn.s,&st) == -1)
{
if (errno == error_noent) return;
- log3("warning: unable to stat ",fn.s,"; will try again later\n");
+ Log3("warning: unable to stat ",fn.s,"; will try again later\n");
goto fail;
}
@@ -1175,13 +1175,13 @@ unsigned long id;
goto fail; /* injectbounce() produced error message */
strnum3[fmt_ulong(strnum3,id)] = 0;
- log3("end msg ",strnum3,"\n");
+ Log3("end msg ",strnum3,"\n");
/* -todo +info -local -remote -bounce */
fnmake_info(id);
if (unlink(fn.s) == -1)
{
- log3("warning: unable to unlink ",fn.s,"; will try again later\n");
+ Log3("warning: unable to unlink ",fn.s,"; will try again later\n");
goto fail;
}
@@ -1190,7 +1190,7 @@ unsigned long id;
if (substdio_putflush(&sstoqc,fn.s,fn.len) == -1) { cleandied(); return; }
if (substdio_get(&ssfromqc,&ch,1) != 1) { cleandied(); return; }
if (ch != '+')
- log3("warning: qmail-clean unable to clean up ",fn.s,"\n");
+ Log3("warning: qmail-clean unable to clean up ",fn.s,"\n");
return;
@@ -1302,30 +1302,30 @@ fd_set *rfds;
fnmake_todo(id);
fd = open_read(fn.s);
- if (fd == -1) { log3("warning: unable to open ",fn.s,"\n"); return; }
+ if (fd == -1) { Log3("warning: unable to open ",fn.s,"\n"); return; }
fnmake_mess(id);
/* just for the statistics */
if (stat(fn.s,&st) == -1)
- { log3("warning: unable to stat ",fn.s,"\n"); goto fail; }
+ { Log3("warning: unable to stat ",fn.s,"\n"); goto fail; }
for (c = 0;c < CHANNELS;++c)
{
fnmake_chanaddr(id,c);
if (unlink(fn.s) == -1) if (errno != error_noent)
- { log3("warning: unable to unlink ",fn.s,"\n"); goto fail; }
+ { Log3("warning: unable to unlink ",fn.s,"\n"); goto fail; }
}
fnmake_info(id);
if (unlink(fn.s) == -1) if (errno != error_noent)
- { log3("warning: unable to unlink ",fn.s,"\n"); goto fail; }
+ { Log3("warning: unable to unlink ",fn.s,"\n"); goto fail; }
fdinfo = open_excl(fn.s);
if (fdinfo == -1)
- { log3("warning: unable to create ",fn.s,"\n"); goto fail; }
+ { Log3("warning: unable to create ",fn.s,"\n"); goto fail; }
strnum3[fmt_ulong(strnum3,id)] = 0;
- log3("new msg ",strnum3,"\n");
+ Log3("new msg ",strnum3,"\n");
for (c = 0;c < CHANNELS;++c) flagchan[c] = 0;
@@ -1341,7 +1341,7 @@ fd_set *rfds;
{
/* perhaps we're out of memory, perhaps an I/O error */
fnmake_todo(id);
- log3("warning: trouble reading ",fn.s,"\n"); goto fail;
+ Log3("warning: trouble reading ",fn.s,"\n"); goto fail;
}
if (!match) break;
@@ -1357,17 +1357,17 @@ fd_set *rfds;
if (substdio_putflush(&ssinfo,todoline.s,todoline.len) == -1)
{
fnmake_info(id);
- log3("warning: trouble writing to ",fn.s,"\n"); goto fail;
+ Log3("warning: trouble writing to ",fn.s,"\n"); goto fail;
}
Log2("info msg ",strnum3);
strnum2[fmt_ulong(strnum2,(unsigned long) st.st_size)] = 0;
Log2(": bytes ",strnum2);
- log1(" envelope_from <"); logsafe(todoline.s + 1);
+ Log1(" envelope_from <"); logsafe(todoline.s + 1);
strnum2[fmt_ulong(strnum2,pid)] = 0;
Log2("> qp ",strnum2);
strnum2[fmt_ulong(strnum2,uid)] = 0;
Log2(" uid ",strnum2);
- log1("\n");
+ Log1("\n");
break;
case 'T':
switch(rewrite(todoline.s + 1))
@@ -1381,7 +1381,7 @@ fd_set *rfds;
fnmake_chanaddr(id,c);
fdchan[c] = open_excl(fn.s);
if (fdchan[c] == -1)
- { log3("warning: unable to create ",fn.s,"\n"); goto fail; }
+ { Log3("warning: unable to create ",fn.s,"\n"); goto fail; }
substdio_fdbuf(&sschan[c]
,write,fdchan[c],todobufchan[c],sizeof(todobufchan[c]));
flagchan[c] = 1;
@@ -1389,12 +1389,12 @@ fd_set *rfds;
if (substdio_bput(&sschan[c],rwline.s,rwline.len) == -1)
{
fnmake_chanaddr(id,c);
- log3("warning: trouble writing to ",fn.s,"\n"); goto fail;
+ Log3("warning: trouble writing to ",fn.s,"\n"); goto fail;
}
break;
default:
fnmake_todo(id);
- log3("warning: unknown record type in ",fn.s,"\n"); goto fail;
+ Log3("warning: unknown record type in ",fn.s,"\n"); goto fail;
}
}
@@ -1402,9 +1402,9 @@ fd_set *rfds;
fnmake_info(id);
if (substdio_flush(&ssinfo) == -1)
- { log3("warning: trouble writing to ",fn.s,"\n"); goto fail; }
+ { Log3("warning: trouble writing to ",fn.s,"\n"); goto fail; }
if (fsync(fdinfo) == -1)
- { log3("warning: trouble fsyncing ",fn.s,"\n"); goto fail; }
+ { Log3("warning: trouble fsyncing ",fn.s,"\n"); goto fail; }
close(fdinfo); fdinfo = -1;
for (c = 0;c < CHANNELS;++c)
@@ -1412,9 +1412,9 @@ fd_set *rfds;
{
fnmake_chanaddr(id,c);
if (substdio_flush(&sschan[c]) == -1)
- { log3("warning: trouble writing to ",fn.s,"\n"); goto fail; }
+ { Log3("warning: trouble writing to ",fn.s,"\n"); goto fail; }
if (fsync(fdchan[c]) == -1)
- { log3("warning: trouble fsyncing ",fn.s,"\n"); goto fail; }
+ { Log3("warning: trouble fsyncing ",fn.s,"\n"); goto fail; }
close(fdchan[c]); fdchan[c] = -1;
}
@@ -1423,7 +1423,7 @@ fd_set *rfds;
if (substdio_get(&ssfromqc,&ch,1) != 1) { cleandied(); return; }
if (ch != '+')
{
- log3("warning: qmail-clean unable to clean up ",fn.s,"\n");
+ Log3("warning: qmail-clean unable to clean up ",fn.s,"\n");
return;
}
@@ -1484,10 +1484,10 @@ void regetcontrols()
int r;
if (control_readfile(&newlocals,"control/locals",1) != 1)
- { log1("alert: unable to reread control/locals\n"); return; }
+ { Log1("alert: unable to reread control/locals\n"); return; }
r = control_readfile(&newvdoms,"control/virtualdomains",0);
if (r == -1)
- { log1("alert: unable to reread control/virtualdomains\n"); return; }
+ { Log1("alert: unable to reread control/virtualdomains\n"); return; }
constmap_free(&maplocals);
constmap_free(&mapvdoms);
@@ -1508,13 +1508,13 @@ void reread()
{
if (chdir(auto_qmail) == -1)
{
- log1("alert: unable to reread controls: unable to switch to home directory\n");
+ Log1("alert: unable to reread controls: unable to switch to home directory\n");
return;
}
regetcontrols();
while (chdir("queue") == -1)
{
- log1("alert: unable to switch back to queue directory; HELP! sleeping...\n");
+ Log1("alert: unable to switch back to queue directory; HELP! sleeping...\n");
sleep(10);
}
}
@@ -1530,11 +1530,11 @@ void main()
int c;
if (chdir(auto_qmail) == -1)
- { log1("alert: cannot start: unable to switch to home directory\n"); _exit(111); }
+ { Log1("alert: cannot start: unable to switch to home directory\n"); _exit(111); }
if (!getcontrols())
- { log1("alert: cannot start: unable to read controls\n"); _exit(111); }
+ { Log1("alert: cannot start: unable to read controls\n"); _exit(111); }
if (chdir("queue") == -1)
- { log1("alert: cannot start: unable to switch to queue directory\n"); _exit(111); }
+ { Log1("alert: cannot start: unable to switch to queue directory\n"); _exit(111); }
sig_pipeignore();
sig_termcatch(sigterm);
sig_alarmcatch(sigalrm);
@@ -1544,9 +1544,9 @@ void main()
fd = open_write("lock/sendmutex");
if (fd == -1)
- { log1("alert: cannot start: unable to open mutex\n"); _exit(111); }
+ { Log1("alert: cannot start: unable to open mutex\n"); _exit(111); }
if (lock_exnb(fd) == -1)
- { log1("alert: cannot start: qmail-send is already running\n"); _exit(111); }
+ { Log1("alert: cannot start: qmail-send is already running\n"); _exit(111); }
numjobs = 0;
for (c = 0;c < CHANNELS;++c)
@@ -1558,7 +1558,7 @@ void main()
r = read(chanfdin[c],&ch,1);
while ((r == -1) && (errno == error_intr));
if (r < 1)
- { log1("alert: cannot start: hath the daemon spawn no fire?\n"); _exit(111); }
+ { Log1("alert: cannot start: hath the daemon spawn no fire?\n"); _exit(111); }
u = (unsigned int) (unsigned char) ch;
if (concurrency[c] > u) concurrency[c] = u;
numjobs += concurrency[c];
@@ -1601,7 +1601,7 @@ void main()
if (errno == error_intr)
;
else
- log1("warning: trouble in select\n");
+ Log1("warning: trouble in select\n");
else
{
recent = now();
@@ -1614,6 +1614,6 @@ void main()
}
}
pqfinish();
- log1("status: exiting\n");
+ Log1("status: exiting\n");
_exit(0);
}
diff --git a/qsutil.c b/qsutil.c
index 59e68c7..56153e7 100644
--- a/qsutil.c
+++ b/qsutil.c
@@ -10,19 +10,19 @@ static struct substdio sserr = SUBSTDIO_FDBUF(write,0,errbuf,1);
void logsa(sa) stralloc *sa; {
substdio_putflush(&sserr,sa->s,sa->len); }
-void log1(s1) char *s1; {
+void Log1(s1) char *s1; {
substdio_putsflush(&sserr,s1); }
void Log2(s1,s2) char *s1; char *s2; {
substdio_putsflush(&sserr,s1);
substdio_putsflush(&sserr,s2); }
-void log3(s1,s2,s3) char *s1; char *s2; char *s3; {
+void Log3(s1,s2,s3) char *s1; char *s2; char *s3; {
substdio_putsflush(&sserr,s1);
substdio_putsflush(&sserr,s2);
substdio_putsflush(&sserr,s3); }
-void nomem() { log1("alert: out of memory, sleeping...\n"); sleep(10); }
+void nomem() { Log1("alert: out of memory, sleeping...\n"); sleep(10); }
void pausedir(dir) char *dir;
-{ log3("alert: unable to opendir ",dir,", sleeping...\n"); sleep(10); }
+{ Log3("alert: unable to opendir ",dir,", sleeping...\n"); sleep(10); }
static int issafe(ch) char ch;
{
diff --git a/qsutil.h b/qsutil.h
index 028d03f..e55ba60 100644
--- a/qsutil.h
+++ b/qsutil.h
@@ -1,9 +1,9 @@
#ifndef QSUTIL_H
#define QSUTIL_H
-extern void log1();
+extern void Log1();
extern void Log2();
-extern void log3();
+extern void Log3();
extern void logsa();
extern void nomem();
extern void pausedir();