starcalc
/
flm01
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into bbh

This commit is contained in:
Bart Van Der Meerssche 2010-09-18 09:40:28 +02:00
parent 67e0594ae6 6b998ddd44
commit 13424b5800
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/drupal/modules/logger/logger.drush.inc
View File

@ -124,7 +124,7 @@ function _logger_create_node($serial, $country ="", $uid = 0) {
// create the meter base rrd // create the meter base rrd
if (!file_exists($path->base . $meter .'.rrd')) { if (!file_exists($path->base . $meter .'.rrd')) {
$command = $path->root .'/rrdtool create '. $path->base . $meter .'.rrd -b 1199487600 -s 60 DS:meter:DERIVE:8640000:0:20 RRA:AVERAGE:0.5:1:120 RRA:AVERAGE:0.5:15:192 RRA:AVERAGE:0.5:1440:60 RRA:AVERAGE:0.5:10080:520'; $command = $path->root .'/rrdtool create '. $path->base . $meter .'.rrd -b 1199487600 -s 60 DS:meter:DERIVE:8640000:0:20 RRA:AVERAGE:0.5:1:1440 RRA:AVERAGE:0.5:15:672 RRA:AVERAGE:0.5:1440:365 RRA:AVERAGE:0.5:10080:520';
system($command, $return); system($command, $return);
if (!($return == 0)) { if (!($return == 0)) {
drush_set_error('LOGGER_CREATE_RRD_BASE_ERROR', dt('Error creating the base @meter rrd.', array('@meter' => $meter))); drush_set_error('LOGGER_CREATE_RRD_BASE_ERROR', dt('Error creating the base @meter rrd.', array('@meter' => $meter)));
@ -133,7 +133,7 @@ function _logger_create_node($serial, $country ="", $uid = 0) {
// create the meter night rrd // create the meter night rrd
if (!file_exists($path->night . $meter .'.rrd')) { if (!file_exists($path->night . $meter .'.rrd')) {
$command = $path->root .'/rrdtool create '. $path->night . $meter .'.rrd -b 1199487600 -s 86400 DS:meter:GAUGE:8640000:0:20 RRA:AVERAGE:0.5:1:60 RRA:AVERAGE:0.5:7:520'; $command = $path->root .'/rrdtool create '. $path->night . $meter .'.rrd -b 1199487600 -s 86400 DS:meter:GAUGE:8640000:0:20 RRA:AVERAGE:0.5:1:365 RRA:AVERAGE:0.5:7:520';
system($command, $return); system($command, $return);
if (!($return == 0)) { if (!($return == 0)) {
drush_set_error('LOGGER_CREATE_RRD_NIGHT_ERROR', dt('Error creating the night @meter rrd.', array('@meter' => $meter))); drush_set_error('LOGGER_CREATE_RRD_NIGHT_ERROR', dt('Error creating the night @meter rrd.', array('@meter' => $meter)));