Provide a convenient debugging macro.

Rename logmsg to wy_log.

1 files changed, 22 insertions, 31 deletions

diff --git a/src/job.c b/src/job.c
index 11e488f..316a6a2 100644
--- a/src/job.c
+++ b/src/job.c
@@ -149,13 +149,12 @@ job_start(struct job *job)
 	pid_t pid;
 
 	if (jobmax && jobcnt == jobmax) {
-		logmsg(LOG_NOTICE, "maximum number of processes active");
+		wy_log(LOG_NOTICE, "maximum number of processes active");
 		return 1;
 	}
 
-	if (wy_debug_level)
-		logmsg(LOG_DEBUG, _("starting job: %s, %lu"),
-		       job->spool->tag, (unsigned long)job->uid);
+	wy_debug(1, (_("starting job: %s, %lu"),
+		     job->spool->tag, (unsigned long)job->uid));
 
 	if (single_process) {
 		if (wydawca_scanner(job))
@@ -180,7 +179,7 @@ job_start(struct job *job)
 			close(i);
 		exit(wydawca_scanner(job) ? WYDAWCA_EX_AGAIN : 0);
 	} else if (pid == -1) {
-		logmsg(LOG_CRIT, "fork: %s", strerror(errno));
+		wy_log(LOG_CRIT, "fork: %s", strerror(errno));
 		return -1;
 	} else {
 		job->state = STATE_ACTIVE;
@@ -195,9 +194,8 @@ job_remove(struct job *job)
 {
 	struct job *p;
 
-	if (wy_debug_level)
-		logmsg(LOG_DEBUG, _("removing job: %s, %lu"),
-		       job->spool->tag, (unsigned long)job->uid);
+	wy_debug(1, (_("removing job: %s, %lu"),
+		     job->spool->tag, (unsigned long)job->uid));
 	p = job->prev;
 	if (p)
 		p->next = job->next;
@@ -238,9 +236,8 @@ schedule_job(struct spool *spool, uid_t uid, struct file_triplet *tp)
 	if (!spool)
 		spool = &fake_spool;
 
-	if (wy_debug_level)
-		logmsg(LOG_DEBUG, _("scheduling job: %s, %lu"),
-		       spool->tag, (unsigned long)uid);
+	wy_debug(1, (_("scheduling job: %s, %lu"),
+		     spool->tag, (unsigned long)uid));
 
 	job = job_locate(spool, uid, tp ? STATE_QUEUED : STATE_ANY);
 	if (!job) {
@@ -268,21 +265,17 @@ print_status(struct job *job, int expect_term)
 	if (WIFEXITED(status)) {
 		int exit_code = WEXITSTATUS(status);
 		if (exit_code == 0) {
-			if (wy_debug_level)
-				logmsg(LOG_DEBUG,
-				       _("%lu (%s, %s) exited successfully"),
-				       (unsigned long)job->pid,
-				       job->spool->tag,
-				       pw->pw_name);
+			wy_debug(1, (_("%lu (%s, %s) exited successfully"),
+				     (unsigned long)job->pid,
+				     job->spool->tag,
+				     pw->pw_name));
 		} else if (exit_code == WYDAWCA_EX_AGAIN) {
-			if (wy_debug_level)
-				logmsg(LOG_DEBUG,
-				       _("%lu (%s, %s) reported tempfail"),
-				       (unsigned long)job->pid,
-				       job->spool->tag,
-				       pw->pw_name);
+			wy_debug(1, (_("%lu (%s, %s) reported tempfail"),
+				     (unsigned long)job->pid,
+				     job->spool->tag,
+				     pw->pw_name));
 		} else
-			logmsg(LOG_ERR,
+			wy_log(LOG_ERR,
 			       _("%lu (%s, %s) failed with status %d"),
 			       (unsigned long)job->pid, job->spool->tag,
 			       pw->pw_name, exit_code);
@@ -295,23 +288,23 @@ print_status(struct job *job, int expect_term)
 		} else
 			prio = LOG_ERR;
 
-		logmsg(prio,
+		wy_log(prio,
 		       _("%lu (%s, %s) terminated on signal %d"),
 		       (unsigned long)job->pid, job->spool->tag,
 		       pw->pw_name, WTERMSIG(status));
 	} else if (WIFSTOPPED(status))
-		logmsg(LOG_NOTICE,
+		wy_log(LOG_NOTICE,
 		       _("%lu (%s, %s) stopped on signal %d"),
 		       (unsigned long)job->pid, job->spool->tag,
 		       pw->pw_name, WSTOPSIG(status));
 #ifdef WCOREDUMP
 	else if (WCOREDUMP(status))
-		logmsg(LOG_NOTICE,
+		wy_log(LOG_NOTICE,
 		       _("%lu (%s, %s) dumped core"),
 		       (unsigned long)job->pid, job->spool->tag, pw->pw_name);
 #endif
 	else
-		logmsg(LOG_ERR,
+		wy_log(LOG_ERR,
 		       _("%lu (%s, %s) terminated with unrecognized status"),
 		       (unsigned long)job->pid, job->spool->tag, pw->pw_name);
 }
@@ -384,9 +377,7 @@ job_queue_runner(time_t min_interval)
 	}
 
 	if (min_interval) {
-		if (wy_debug_level > 1)
-			logmsg(LOG_DEBUG, _("computed interval: %lu"),
-			       min_interval);
+		wy_debug(2, (_("computed interval: %lu"), min_interval));
 		set_timer(min_interval);
 	}
 }