[Nagios-checkins] SF.net SVN: nagios:[2343] nagioscore/trunk/base/workers.c

[<ag...@us...>]

Revision: 2343
          http://nagios.svn.sourceforge.net/nagios/?rev=2343&view=rev
Author:   ageric
Date:     2012-10-15 12:04:24 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
core: Use "wproc" prefix when logging worker stuff

This makes it easy to grep for such issues.

Signed-off-by: Andreas Ericsson <ae...@op...>

Modified Paths:
--------------
    nagioscore/trunk/base/workers.c

Modified: nagioscore/trunk/base/workers.c
===================================================================
--- nagioscore/trunk/base/workers.c	2012-10-15 12:04:06 UTC (rev 2342)
+++ nagioscore/trunk/base/workers.c	2012-10-15 12:04:24 UTC (rev 2343)
@@ -123,7 +123,7 @@
 		/* these require nothing special */
 		break;
 	default:
-		logit(NSLOG_RUNTIME_WARNING, TRUE, "Workers: Unknown job type: %d\n", job->type);
+		logit(NSLOG_RUNTIME_WARNING, TRUE, "wproc: Unknown job type: %d\n", job->type);
 		break;
 	}
 
@@ -331,7 +331,7 @@
 		code = wp_phash(key, kvv->kv[i].key_len);
 		switch (code) {
 		case -1:
-			logit(NSLOG_RUNTIME_WARNING, TRUE, "Unrecognized worker result variable: (i=%d) %s=%s\n", i, key, value);
+			logit(NSLOG_RUNTIME_WARNING, TRUE, "wproc: Unrecognized result variable: (i=%d) %s=%s\n", i, key, value);
 			break;
 
 		case WPRES_job_id:
@@ -402,7 +402,7 @@
 			break;
 
 		default:
-			logit(NSLOG_RUNTIME_WARNING, TRUE, "Recognized but unhandled worker result variable: %s=%s\n", key, value);
+			logit(NSLOG_RUNTIME_WARNING, TRUE, "wproc: Recognized but unhandled result variable: %s=%s\n", key, value);
 			break;
 		}
 	}
@@ -421,11 +421,11 @@
 	ret = iocache_read(wp->ioc, wp->sd);
 
 	if (ret < 0) {
-		logit(NSLOG_RUNTIME_WARNING, TRUE, "iocache_read() from %s returned %d: %s\n",
+		logit(NSLOG_RUNTIME_WARNING, TRUE, "wproc: iocache_read() from %s returned %d: %s\n",
 			  wp->source_name, ret, strerror(errno));
 		return 0;
 	} else if (ret == 0) {
-		logit(NSLOG_INFO_MESSAGE, TRUE, "Socket to worker %s broken, removing", wp->source_name);
+		logit(NSLOG_INFO_MESSAGE, TRUE, "wproc: Socket to worker %s broken, removing", wp->source_name);
 		iobroker_unregister(nagios_iobs, sd);
 		to_remove = wp;
 		dkhash_walk_data(specialized_workers, remove_specialized);
@@ -433,7 +433,7 @@
 			/* there aren't global workers left, we can't run any more checks
 			 * we should try respawning a few of the standard ones
 			 */
-			logit(NSLOG_RUNTIME_ERROR, TRUE, "All our workers are dead, we can't do anything!");
+			logit(NSLOG_RUNTIME_ERROR, TRUE, "wproc: All our workers are dead, we can't do anything!");
 		}
 		if (wp->jobs) {
 			int i, rescheduled = 0;
@@ -476,13 +476,13 @@
 
 		job = get_job(wp, wpres.job_id);
 		if (!job) {
-			logit(NSLOG_RUNTIME_WARNING, TRUE, "Worker job with id '%d' doesn't exist on worker %d.\n",
-				  job_id, wp->pid);
+			logit(NSLOG_RUNTIME_WARNING, TRUE, "wproc: Job with id '%d' doesn't exist on %s.\n",
+				  job_id, wp->source_name);
 			continue;
 		}
 		if (wpres.type != job->type) {
-			logit(NSLOG_RUNTIME_WARNING, TRUE, "Worker %d claims job %d is type %d, but we think it's type %d\n",
-				  wp->pid, job->id, wpres.type, job->type);
+			logit(NSLOG_RUNTIME_WARNING, TRUE, "wproc: %s claims job %d is type %d, but we think it's type %d\n",
+				  wp->source_name, job->id, wpres.type, job->type);
 			break;
 		}
 		oj = (wproc_object_job *)job->arg;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.