[Pkg-nagios-changes] [SCM] Debian packaging for mod gearman. branch, master, updated. f5edd3e88aa2138dcf6d044c835fbd0ada944168

Sven Nierlein sven at nierlein.de
Fri Feb 11 11:18:01 UTC 2011


The following commit has been merged in the master branch:
commit e39c58375fa4c9ab48153dd7b837c68e6e370dff
Author: Sven Nierlein <sven at nierlein.de>
Date:   Sat Jan 22 00:47:35 2011 +0100

    fixed problem with false positives in "double used worker slot" check

diff --git a/worker/worker_client.c b/worker/worker_client.c
index da641d1..0d7b460 100644
--- a/worker/worker_client.c
+++ b/worker/worker_client.c
@@ -624,8 +624,8 @@ void set_state(int status) {
     if(status == GM_JOB_END) {
         shm[0]++; /* increase jobs done */
         /* pid in our status slot changed, this should not happen -> exit */
-        if( shm[shm_index] != current_pid ) {
-            gm_log( GM_LOG_ERROR, "double used worker slot: %d != %d\n", getpid(), shm[shm_index] );
+        if( shm[shm_index] != current_pid && shm[shm_index] != -current_pid ) {
+            gm_log( GM_LOG_ERROR, "double used worker slot: %d != %d\n", current_pid, shm[shm_index] );
             clean_worker_exit(0);
             exit( EXIT_FAILURE );
         }

-- 
Debian packaging for mod gearman.



More information about the Pkg-nagios-changes mailing list