[Pkg-nagios-changes] [SCM] Debian packaging for mod gearman. branch, master, updated. debian/1.1.1-1-21-gf620933

[Michael Fladischer]

The following commit has been merged in the master branch:
commit f43b52afed9e0cc84da0ba5f326b6934ab75cb9b
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Jan 12 12:13:33 2012 +0100

    Fix spelling and synopsis warnings.

diff --git a/debian/control b/debian/control
index e28e08b..b6c9152 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Description: Documentation and examples for Mod Gearman
 Package: mod-gearman-module
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Event broker module to distribute service checks.
+Description: Event broker module to distribute service checks
  Event broker module for Nagios or Icinga.  This module adds
  servicechecks, hostchecks and eventhandlers to a queue on a Gearman
  job server.
diff --git a/debian/mod-gearman-worker.init b/debian/mod-gearman-worker.init
index 540b058..2a45ea2 100755
--- a/debian/mod-gearman-worker.init
+++ b/debian/mod-gearman-worker.init
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ### BEGIN INIT INFO
-# Provides:          mod_gearman_worker
+# Provides:          mod-gearman-worker
 # Required-Start:    $local_fs $remote_fs
 # Required-Stop:     $local_fs $remote_fs
 # Should-Start:
@@ -9,6 +9,9 @@
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Control the mod-gearman worker daemon
+# Description:       Control the mod-gearman worker daemon which fetches 
+#                    and processes jobs (servicechecks, hostchecks or 
+#                    eventhandlers) from a gearman-job-server instance.
 ### END INIT INFO
 
 
diff --git a/debian/patches/fix_spellings.patch b/debian/patches/fix_spellings.patch
new file mode 100644
index 0000000..5fc5fad
--- /dev/null
+++ b/debian/patches/fix_spellings.patch
@@ -0,0 +1,118 @@
+--- a/common/gearman.c
++++ b/common/gearman.c
+@@ -269,7 +269,7 @@
+     if(free_uniq)
+         free(uniq);
+ 
+-    gm_log( GM_LOG_TRACE, "add_job_to_queue() finished sucessfully: %d %d\n", ret1, ret2 );
++    gm_log( GM_LOG_TRACE, "add_job_to_queue() finished successfully: %d %d\n", ret1, ret2 );
+     return GM_OK;
+ }
+ 
+--- a/include/worker.h
++++ b/include/worker.h
+@@ -124,7 +124,7 @@
+ void setup_child_communicator(void);
+ 
+ /**
+- * finish and clean all childs and shared memory segments, then exit.
++ * finish and clean all children and shared memory segments, then exit.
+  *
+  * @param[in] sig - signal which caused the exit
+  *
+@@ -164,7 +164,7 @@
+  *
+  * @return nothing
+  */
+-void stop_childs(int mode);
++void stop_children(int mode);
+ 
+ /**
+  * main loop to maintain the child population
+@@ -174,7 +174,7 @@
+ void monitor_loop(void);
+ 
+ /**
+- * check and start new worker childs if level is too low
++ * check and start new worker children if level is too low
+  *
+  * @return nothing
+  */
+--- a/worker/worker.c
++++ b/worker/worker.c
+@@ -156,7 +156,7 @@
+     /* start status worker */
+     make_new_child(GM_WORKER_STATUS);
+ 
+-    /* setup childs */
++    /* setup children */
+     for(x=0; x < mod_gm_opt->min_worker; x++) {
+         make_new_child(GM_WORKER_MULTI);
+     }
+@@ -583,8 +583,8 @@
+     if(mod_gm_opt->pidfile != NULL)
+         unlink(mod_gm_opt->pidfile);
+ 
+-    /* stop all childs */
+-    stop_childs(GM_WORKER_STOP);
++    /* stop all children */
++    stop_children(GM_WORKER_STOP);
+ 
+     /* detach shm */
+     if(shmdt(shm) < 0)
+@@ -596,20 +596,20 @@
+ }
+ 
+ 
+-/* stop all childs */
+-void stop_childs(int mode) {
++/* stop all children */
++void stop_children(int mode) {
+     int status, chld;
+     int waited = 0;
+     int x, curpid;
+ 
+-    gm_log( GM_LOG_TRACE, "stop_childs(%d)\n", mode);
++    gm_log( GM_LOG_TRACE, "stop_children(%d)\n", mode);
+ 
+     /* ignore some signals for now */
+     signal(SIGTERM, SIG_IGN);
+     signal(SIGINT,  SIG_IGN);
+ 
+     /*
+-     * send term signal to our childs
++     * send term signal to our children
+      * children will finish the current job and exit
+      */
+     killpg(0, SIGTERM);
+@@ -633,7 +633,7 @@
+         count_current_worker(GM_DISABLED);
+         if(current_number_of_workers == 0)
+             return;
+-        gm_log( GM_LOG_TRACE, "still waiting (%d) %d childs missing...\n", waited, current_number_of_workers);
++        gm_log( GM_LOG_TRACE, "still waiting (%d) %d children missing...\n", waited, current_number_of_workers);
+     }
+ 
+     if(mode == GM_WORKER_STOP) {
+@@ -669,7 +669,7 @@
+             }
+         }
+ 
+-        /* count childs a last time */
++        /* count children a last time */
+         count_current_worker(GM_DISABLED);
+         if(current_number_of_workers == 0)
+             return;
+@@ -763,10 +763,10 @@
+ 
+     /*
+      * restart workers gracefully:
+-     * send term signal to our childs
++     * send term signal to our children
+      * children will finish the current job and exit
+      */
+-    stop_childs(GM_WORKER_RESTART);
++    stop_children(GM_WORKER_RESTART);
+ 
+     /* start status worker */
+     make_new_child(GM_WORKER_STATUS);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a0acb8f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_spellings.patch

-- 
Debian packaging for mod gearman.