- adjust identing after patch
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2419 152afb58-edef-0310-8abb-c4023f1b3aa9svn/tags/lighttpd-1.4.23
parent
0e84d4d4f5
commit
61332595cb
|
@ -246,52 +246,52 @@ static int mod_rrdtool_create_rrd(server *srv, plugin_data *p, plugin_config *s)
|
|||
return HANDLER_GO_ON;
|
||||
}
|
||||
|
||||
int r ;
|
||||
/* create a new one */
|
||||
buffer_copy_string_len(p->cmd, CONST_STR_LEN("create "));
|
||||
buffer_append_string_buffer(p->cmd, s->path_rrd);
|
||||
buffer_append_string_len(p->cmd, CONST_STR_LEN(
|
||||
" --step 60 "
|
||||
"DS:InOctets:ABSOLUTE:600:U:U "
|
||||
"DS:OutOctets:ABSOLUTE:600:U:U "
|
||||
"DS:Requests:ABSOLUTE:600:U:U "
|
||||
"RRA:AVERAGE:0.5:1:600 "
|
||||
"RRA:AVERAGE:0.5:6:700 "
|
||||
"RRA:AVERAGE:0.5:24:775 "
|
||||
"RRA:AVERAGE:0.5:288:797 "
|
||||
"RRA:MAX:0.5:1:600 "
|
||||
"RRA:MAX:0.5:6:700 "
|
||||
"RRA:MAX:0.5:24:775 "
|
||||
"RRA:MAX:0.5:288:797 "
|
||||
"RRA:MIN:0.5:1:600 "
|
||||
"RRA:MIN:0.5:6:700 "
|
||||
"RRA:MIN:0.5:24:775 "
|
||||
"RRA:MIN:0.5:288:797\n"));
|
||||
int r;
|
||||
/* create a new one */
|
||||
buffer_copy_string_len(p->cmd, CONST_STR_LEN("create "));
|
||||
buffer_append_string_buffer(p->cmd, s->path_rrd);
|
||||
buffer_append_string_len(p->cmd, CONST_STR_LEN(
|
||||
" --step 60 "
|
||||
"DS:InOctets:ABSOLUTE:600:U:U "
|
||||
"DS:OutOctets:ABSOLUTE:600:U:U "
|
||||
"DS:Requests:ABSOLUTE:600:U:U "
|
||||
"RRA:AVERAGE:0.5:1:600 "
|
||||
"RRA:AVERAGE:0.5:6:700 "
|
||||
"RRA:AVERAGE:0.5:24:775 "
|
||||
"RRA:AVERAGE:0.5:288:797 "
|
||||
"RRA:MAX:0.5:1:600 "
|
||||
"RRA:MAX:0.5:6:700 "
|
||||
"RRA:MAX:0.5:24:775 "
|
||||
"RRA:MAX:0.5:288:797 "
|
||||
"RRA:MIN:0.5:1:600 "
|
||||
"RRA:MIN:0.5:6:700 "
|
||||
"RRA:MIN:0.5:24:775 "
|
||||
"RRA:MIN:0.5:288:797\n"));
|
||||
|
||||
if (-1 == (r = safe_write(p->write_fd, p->cmd->ptr, p->cmd->used - 1))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "ss",
|
||||
"rrdtool-write: failed", strerror(errno));
|
||||
if (-1 == (r = safe_write(p->write_fd, p->cmd->ptr, p->cmd->used - 1))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "ss",
|
||||
"rrdtool-write: failed", strerror(errno));
|
||||
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
|
||||
buffer_prepare_copy(p->resp, 4096);
|
||||
if (-1 == (r = safe_read(p->read_fd, p->resp->ptr, p->resp->size))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "ss",
|
||||
"rrdtool-read: failed", strerror(errno));
|
||||
buffer_prepare_copy(p->resp, 4096);
|
||||
if (-1 == (r = safe_read(p->read_fd, p->resp->ptr, p->resp->size))) {
|
||||
log_error_write(srv, __FILE__, __LINE__, "ss",
|
||||
"rrdtool-read: failed", strerror(errno));
|
||||
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
|
||||
p->resp->used = r;
|
||||
p->resp->used = r;
|
||||
|
||||
if (p->resp->ptr[0] != 'O' ||
|
||||
p->resp->ptr[1] != 'K') {
|
||||
log_error_write(srv, __FILE__, __LINE__, "sbb",
|
||||
"rrdtool-response:", p->cmd, p->resp);
|
||||
if (p->resp->ptr[0] != 'O' ||
|
||||
p->resp->ptr[1] != 'K') {
|
||||
log_error_write(srv, __FILE__, __LINE__, "sbb",
|
||||
"rrdtool-response:", p->cmd, p->resp);
|
||||
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
return HANDLER_ERROR;
|
||||
}
|
||||
|
||||
return HANDLER_GO_ON;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue