Browse Source

Fix rrd error after graceful restart (fixes #419)

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2401 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/lighttpd-1.4.22
Stefan Bühler 13 years ago
parent
commit
515d800f7c
  1. 1
      NEWS
  2. 9
      src/mod_rrdtool.c

1
NEWS

@ -7,6 +7,7 @@ NEWS
* Fix wrong lua type for CACHE_MISS/CACHE_HIT in mod_cml (fixes #533)
* Fix default vhost in mod_simple_vhost (fixes #1905)
* Handle EINTR in mod_rrdtool (fixes #604)
* Fix rrd error after graceful restart (fixes #419)
- 1.4.21 - 2009-02-16

9
src/mod_rrdtool.c

@ -454,12 +454,15 @@ TRIGGER_FUNC(mod_rrd_trigger) {
if (p->resp->ptr[0] != 'O' ||
p->resp->ptr[1] != 'K') {
p->rrdtool_running = 0;
/* don't fail on this error if we just started (graceful restart, the old one might have just updated too) */
if (!(strstr(p->resp->ptr, "(minimum one second step)") && (srv->cur_ts - srv->startup_ts < 3))) {
p->rrdtool_running = 0;
log_error_write(srv, __FILE__, __LINE__, "sbb",
log_error_write(srv, __FILE__, __LINE__, "sbb",
"rrdtool-response:", p->cmd, p->resp);
return HANDLER_ERROR;
return HANDLER_ERROR;
}
}
s->requests = 0;
s->bytes_written = 0;

Loading…
Cancel
Save