|
[-]
[+]
|
Changed |
icinga-mod_gearman.changes
|
|
|
|
[-]
[+]
|
Changed |
icinga-mod_gearman.spec
^
|
|
|
|
[-]
[+]
|
Changed |
mod_gearman-1.1.0.tar.bz2/Changes
^
|
| @@ -1,5 +1,9 @@
This file documents the revision history for mod_gearman.
+1.1.0 Wed Oct 12 18:36:10 CEST 2011
+ - fixed send_multi performance data headers
+ - fixed segfault when worker runs into timeout
+
1.0.10 Thu Aug 25 16:07:55 CEST 2011
- new option 'show_error_output' for worker
- fixed failed job when host+service > 64 chars
|
|
[-]
[+]
|
Changed |
mod_gearman-1.1.0.tar.bz2/Makefile.am
^
|
| @@ -244,7 +244,7 @@
version:
newversion=$$(dialog --stdout --inputbox "New Version:" 0 0 "$(VERSION)") ; \
if [ -n "$$newversion" ] && [ "$$newversion" != "$(VERSION)" ]; then \
- sed -ri "s/$(VERSION)/$$newversion/" include/common.h configure.ac docs/QUICKSTART; \
+ sed -ri "s/$(VERSION)/$$newversion/" include/common.h configure.ac docs/QUICKSTART support/mod_gearman.spec; \
fi ;
sed -i Changes -e "s/$(VERSION)/$$newversion $(shell date)\n - ...\n\n$(VERSION)/"
$(MAKE) docs
|
|
[-]
[+]
|
Changed |
mod_gearman-1.1.0.tar.bz2/Makefile.in
^
|
| @@ -1226,7 +1226,7 @@
version:
newversion=$$(dialog --stdout --inputbox "New Version:" 0 0 "$(VERSION)") ; \
if [ -n "$$newversion" ] && [ "$$newversion" != "$(VERSION)" ]; then \
- sed -ri "s/$(VERSION)/$$newversion/" include/common.h configure.ac docs/QUICKSTART; \
+ sed -ri "s/$(VERSION)/$$newversion/" include/common.h configure.ac docs/QUICKSTART support/mod_gearman.spec; \
fi ;
sed -i Changes -e "s/$(VERSION)/$$newversion $(shell date)\n - ...\n\n$(VERSION)/"
$(MAKE) docs
|
|
[-]
[+]
|
Changed |
mod_gearman-1.1.0.tar.bz2/README
^
|
| @@ -25,7 +25,7 @@
Download
--------
-* Latest stable release http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.10.tar.gz[version 1.0.10] from August 28 2011
+* Latest stable release http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.1.0.tar.gz[version 1.1.0] from October 12 2011
* Mod Gearman is available for download at: http://labs.consol.de/nagios/mod-gearman
* Source is available at GitHub: http://github.com/sni/mod_gearman
* Older versions are available in the <<_archive,download archive>>.
@@ -840,6 +840,7 @@
Archive
-------
+* http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.1.0.tar.gz[version 1.1.0 - October 12 2011]
* http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.10.tar.gz[version 1.0.10 - August 28 2011]
* http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.9.tar.gz[version 1.0.9 - August 16 2011]
* http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.8.tar.gz[version 1.0.8 - July 22 2011]
|
|
[-]
[+]
|
Changed |
mod_gearman-1.1.0.tar.bz2/common/utils.c
^
|
| @@ -1407,7 +1407,8 @@
free(job->result_queue);
free(job->command_line);
free(job->output);
- free(job->error);
+ if(job->error != NULL)
+ free(job->error);
free(job);
return(GM_OK);
@@ -2024,7 +2025,7 @@
strncat(temp_buffer2, ") - ", (sizeof(temp_buffer2)-1));
}
strncat(temp_buffer2, exec_job->output, (sizeof(temp_buffer2)-1));
- if(mod_gm_opt->show_error_output && strlen(exec_job->error) > 0) {
+ if(mod_gm_opt->show_error_output && exec_job->error != NULL && strlen(exec_job->error) > 0) {
if(strlen(exec_job->output) > 0)
strncat(temp_buffer2, "\\n", (sizeof(temp_buffer2)-1));
strncat(temp_buffer2, "[", (sizeof(temp_buffer2)-1));
|
|
[-]
[+]
|
Changed |
mod_gearman-1.1.0.tar.bz2/configure
^
|
| @@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for mod_gearman 1.0.10.
+# Generated by GNU Autoconf 2.65 for mod_gearman 1.1.0.
#
# Report bugs to <sven.nierlein@consol.de>.
#
@@ -552,8 +552,8 @@
# Identity of this package.
PACKAGE_NAME='mod_gearman'
PACKAGE_TARNAME='mod_gearman'
-PACKAGE_VERSION='1.0.10'
-PACKAGE_STRING='mod_gearman 1.0.10'
+PACKAGE_VERSION='1.1.0'
+PACKAGE_STRING='mod_gearman 1.1.0'
PACKAGE_BUGREPORT='sven.nierlein@consol.de'
PACKAGE_URL=''
@@ -1249,7 +1249,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mod_gearman 1.0.10 to adapt to many kinds of systems.
+\`configure' configures mod_gearman 1.1.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1315,7 +1315,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mod_gearman 1.0.10:";;
+ short | recursive ) echo "Configuration of mod_gearman 1.1.0:";;
esac
cat <<\_ACEOF
@@ -1412,7 +1412,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mod_gearman configure 1.0.10
+mod_gearman configure 1.1.0
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1875,7 +1875,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mod_gearman $as_me 1.0.10, which was
+It was created by mod_gearman $as_me 1.1.0, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2683,7 +2683,7 @@
# Define the identity of the package.
PACKAGE='mod_gearman'
- VERSION='1.0.10'
+ VERSION='1.1.0'
cat >>confdefs.h <<_ACEOF
@@ -5923,7 +5923,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mod_gearman $as_me 1.0.10, which was
+This file was extended by mod_gearman $as_me 1.1.0, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5989,7 +5989,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mod_gearman config.status 1.0.10
+mod_gearman config.status 1.1.0
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
|
|
[-]
[+]
|
Changed |
mod_gearman-1.1.0.tar.bz2/configure.ac
^
|
| @@ -3,7 +3,7 @@
##############################################
AC_PREREQ([2.59])
-AC_INIT([mod_gearman], [1.0.10], [sven.nierlein@consol.de])
+AC_INIT([mod_gearman], [1.1.0], [sven.nierlein@consol.de])
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
AC_CONFIG_SRCDIR([neb_module/mod_gearman.c],[worker/worker.c],[tools/send_gearman.c],[tools/check_gearman.c],[tools/gearman_top.c])
AC_CONFIG_HEADER([config.h])
|
|
[-]
[+]
|
Changed |
mod_gearman-1.1.0.tar.bz2/docs/QUICKSTART
^
|
| @@ -52,9 +52,9 @@
--------------------------------------
#> cd /tmp
-#> wget "http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.10.tar.gz"
-#> tar zxf mod_gearman-1.0.10.tar.gz
-#> cd mod_gearman-1.0.10
+#> wget "http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.1.0.tar.gz"
+#> tar zxf mod_gearman-1.1.0.tar.gz
+#> cd mod_gearman-1.1.0
#> ./configure --prefix=/opt --with-gearman=/opt --with-user=nagios --with-init-dir=/etc/init.d
#> make
#> make install
@@ -118,7 +118,7 @@
--------------------------------------
#> grep mod_gearman /var/log/nagios3/nagios.log
-[1295003042] mod_gearman: Version 1.0.10
+[1295003042] mod_gearman: Version 1.1.0
[1295003042] Event broker module '/opt/lib/mod_gearman/mod_gearman.o' initialized successfully.
--------------------------------------
@@ -152,7 +152,7 @@
--------------------------------------
#> /opt/bin/check_gearman -H localhost -q worker_`hostname` -t 10 -s check
-check_gearman OK - debian64 has 1 worker and is working on 0 jobs. Version: 1.0.10|worker=1 jobs=2c
+check_gearman OK - debian64 has 1 worker and is working on 0 jobs. Version: 1.1.0|worker=1 jobs=2c
--------------------------------------
The interesting number is the last one, '2c' in our case, which means there
|
|
[-]
[+]
|
Changed |
mod_gearman-1.1.0.tar.bz2/docs/QUICKSTART.html
^
|
| @@ -606,9 +606,9 @@
<div class="listingblock">
<div class="content">
<pre><tt>#> cd /tmp
-#> wget "http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.10.tar.gz"
-#> tar zxf mod_gearman-1.0.10.tar.gz
-#> cd mod_gearman-1.0.10
+#> wget "http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.1.0.tar.gz"
+#> tar zxf mod_gearman-1.1.0.tar.gz
+#> cd mod_gearman-1.1.0
#> ./configure --prefix=/opt --with-gearman=/opt --with-user=nagios --with-init-dir=/etc/init.d
#> make
#> make install
@@ -666,7 +666,7 @@
<div class="listingblock">
<div class="content">
<pre><tt>#> grep mod_gearman /var/log/nagios3/nagios.log
-[1295003042] mod_gearman: Version 1.0.10
+[1295003042] mod_gearman: Version 1.1.0
[1295003042] Event broker module '/opt/lib/mod_gearman/mod_gearman.o' initialized successfully.</tt></pre>
</div></div>
</div>
@@ -693,7 +693,7 @@
<div class="listingblock">
<div class="content">
<pre><tt>#> /opt/bin/check_gearman -H localhost -q worker_`hostname` -t 10 -s check
-check_gearman OK - debian64 has 1 worker and is working on 0 jobs. Version: 1.0.10|worker=1 jobs=2c</tt></pre>
+check_gearman OK - debian64 has 1 worker and is working on 0 jobs. Version: 1.1.0|worker=1 jobs=2c</tt></pre>
</div></div>
<div class="paragraph"><p>The interesting number is the last one, <em>2c</em> in our case, which means there
have been already 2 jobs executed by this worker.</p></div>
@@ -733,7 +733,7 @@
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-08-25 16:07:59 CEST
+Last updated 2011-09-23 12:21:01 CEST
</div>
</div>
</body>
|
|
[-]
[+]
|
Changed |
mod_gearman-1.1.0.tar.bz2/docs/README.html
^
|
| @@ -593,7 +593,7 @@
<div class="ulist"><ul>
<li>
<p>
-Latest stable release <a href="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.10.tar.gz">version 1.0.10</a> from August 28 2011
+Latest stable release <a href="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.1.0.tar.gz">version 1.1.0</a> from October 12 2011
</p>
</li>
<li>
@@ -1738,6 +1738,11 @@
<div class="ulist"><ul>
<li>
<p>
+<a href="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.1.0.tar.gz">version 1.1.0 - October 12 2011</a>
+</p>
+</li>
+<li>
+<p>
<a href="http://labs.consol.de/wp-content/uploads/2010/09/mod_gearman-1.0.10.tar.gz">version 1.0.10 - August 28 2011</a>
</p>
</li>
@@ -1827,7 +1832,7 @@
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-08-28 11:11:43 CEST
+Last updated 2011-10-12 18:41:03 CEST
</div>
</div>
</body>
|
|
[-]
[+]
|
Changed |
mod_gearman-1.1.0.tar.bz2/include/common.h
^
|
| @@ -52,7 +52,7 @@
#define MOD_GM_COMMON_H
/* constants */
-#define GM_VERSION "1.0.10"
+#define GM_VERSION "1.1.0"
#define GM_ENABLED 1
#define GM_DISABLED 0
#define GM_BUFFERSIZE 98304
|
|
[-]
[+]
|
Changed |
mod_gearman-1.1.0.tar.bz2/support/mod_gearman.spec
^
|
| @@ -1,5 +1,5 @@
Name: mod_gearman
-Version: 1.0.7
+Version: 1.1.0
Release: 1%{?dist}
License: GNU Public License version 2
Packager: Michael Friedrich <michael.friedrich@univie.ac.at>
@@ -12,6 +12,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
BuildRequires: autoconf, automake, ncurses-devel
BuildRequires: libtool, libtool-ltdl-devel, libevent-devel
+BuildRequires: libgearman
Summary: Gearman module for Icinga/Nagios
Requires(pre,post): /sbin/ldconfig
|
|
[-]
[+]
|
Changed |
mod_gearman-1.1.0.tar.bz2/tools/send_multi.c
^
|
| @@ -390,6 +390,7 @@
int read_child_check(char *bufstart, char *bufend, struct timeval * end_time) {
char *attribute = NULL;
char *attribute2 = NULL;
+ char *attribute3 = NULL;
char *error = NULL;
char temp_buffer[GM_BUFFERSIZE];
double end_time_d;
@@ -448,11 +449,24 @@
strcat(error,"]");
}
- /* performance data */
+ /* performance data with multi headers */
if ((attribute2=read_multi_attribute(bufstart,bufend,"performance")) == NULL) {
snprintf( temp_buffer, sizeof( temp_buffer )-1, "%s%s", decode_xml(attribute), decode_xml(error));
+ } else if ((attribute3=read_multi_attribute(bufstart,bufend,"pplugin")) == NULL) {
+ return 0;
} else {
- snprintf( temp_buffer, sizeof( temp_buffer )-1, "%s%s|%s", decode_xml(attribute), decode_xml(error), decode_xml(attribute2));
+ attribute2 = trim(attribute2);
+ attribute2 = decode_xml(attribute2);
+
+ /* do we have a single quote performance label?
+ then single quote the whole multi header */
+ if (*attribute2 == '\'') {
+ attribute2++;
+ snprintf( temp_buffer, sizeof( temp_buffer )-1, "%s%s|\'%s::%s::%s", decode_xml(attribute), decode_xml(error), mod_gm_opt->service, decode_xml(attribute3), decode_xml(attribute2));
+ /* normal header without single quotes */
+ } else {
+ snprintf( temp_buffer, sizeof( temp_buffer )-1, "%s%s|%s::%s::%s", decode_xml(attribute), decode_xml(error), mod_gm_opt->service, decode_xml(attribute3), decode_xml(attribute2));
+ }
}
mod_gm_opt->message=strdup(temp_buffer);
gm_log( GM_LOG_TRACE, "mod_gm_opt->message: %s\n", mod_gm_opt->message);
@@ -483,9 +497,11 @@
char c;
char *enc_string;
} dtab[] = {
- { '>', ">" },
- { '<', "<" },
- { '&', "&" },
+ { '>', ">" },
+ { '<', "<" },
+ { '&', "&" },
+ { '\'', "'" },
+ { '\|', "|" },
};
int i;
char *found;
|
