summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Strauss <gstrauss@gluelogic.com>2017-09-10 16:29:08 -0400
committerGlenn Strauss <gstrauss@gluelogic.com>2017-09-10 16:29:08 -0400
commit3622d2b66a5a0cb18b6b16c2284d79ede82debf6 (patch)
tree797ad00e812363977bbd61cb424897d9a908ffe7
parent9030cfaecf07fc2426b01f6f3a1df442ccdd3ebb (diff)
downloadlighttpd1.4-3622d2b66a5a0cb18b6b16c2284d79ede82debf6.tar.gz
lighttpd1.4-3622d2b66a5a0cb18b6b16c2284d79ede82debf6.zip
[mod_rrdtool] handle_trigger returns HANDLER_GO_ON
handle_trigger should return HANDLER_GO_ON even on error, since we want other trigger funcs from other modules to be able to perform periodic maintenance
-rw-r--r--src/mod_rrdtool.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mod_rrdtool.c b/src/mod_rrdtool.c
index 2b8a3788..f5e02174 100644
--- a/src/mod_rrdtool.c
+++ b/src/mod_rrdtool.c
@@ -385,7 +385,7 @@ TRIGGER_FUNC(mod_rrd_trigger) {
/* write the data down every minute */
- if (HANDLER_GO_ON != mod_rrdtool_create_rrd(srv, p, s)) return HANDLER_ERROR;
+ if (HANDLER_GO_ON != mod_rrdtool_create_rrd(srv, p, s)) return HANDLER_GO_ON;
buffer_copy_string_len(p->cmd, CONST_STR_LEN("update "));
buffer_append_string_buffer(p->cmd, s->path_rrd);
@@ -402,7 +402,7 @@ TRIGGER_FUNC(mod_rrd_trigger) {
"rrdtool-write: failed", strerror(errno));
mod_rrd_fatal_error(srv, p);
- return HANDLER_ERROR;
+ return HANDLER_GO_ON;
}
if (-1 == safe_read(p->read_fd, p->resp)) {
@@ -410,7 +410,7 @@ TRIGGER_FUNC(mod_rrd_trigger) {
"rrdtool-read: failed", strerror(errno));
mod_rrd_fatal_error(srv, p);
- return HANDLER_ERROR;
+ return HANDLER_GO_ON;
}
if (p->resp->ptr[0] != 'O' ||
@@ -421,7 +421,7 @@ TRIGGER_FUNC(mod_rrd_trigger) {
"rrdtool-response:", p->cmd, p->resp);
mod_rrd_fatal_error(srv, p);
- return HANDLER_ERROR;
+ return HANDLER_GO_ON;
}
}
s->requests = 0;