diff options
| author | smos <seth.mos@dds.nl> | 2010-05-12 14:00:09 +0200 |
|---|---|---|
| committer | smos <seth.mos@dds.nl> | 2010-05-12 14:02:16 +0200 |
| commit | e256e9d4d1dedb1418204d2879c7dcf7edcf2137 (patch) | |
| tree | 75679ff9db5a20341413044af3ba626abed5eb2a /etc | |
| parent | 1122a892f2af418daa5964d41d1d942fc89d470e (diff) | |
| download | pfsense-e256e9d4d1dedb1418204d2879c7dcf7edcf2137.zip pfsense-e256e9d4d1dedb1418204d2879c7dcf7edcf2137.tar.gz | |
Change the exec() calls to mwexec, this supresses the rrdtool messages during boot if the rrd files have a newer timestamp then the attempt to update
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/rrd.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/etc/inc/rrd.inc b/etc/inc/rrd.inc index b20fe55..fa2920e 100644 --- a/etc/inc/rrd.inc +++ b/etc/inc/rrd.inc @@ -37,7 +37,7 @@ function dump_rrd_to_xml($rrddatabase, $xmldumpfile) { $rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; if(file_exists($xmldumpfile)) - exec("rm {$xmldumpfile}"); + mwexec("rm {$xmldumpfile}"); exec("$rrdtool dump {$rrddatabase} {$xmldumpfile} 2>&1", $dumpout, $dumpret); if ($dumpret <> 0) { @@ -275,7 +275,7 @@ function enable_rrd_graphing() { /* enter UNKNOWN values in the RRD so it knows we rebooted. */ if($g['booting']) { - exec("$rrdtool update $rrddbpath$ifname$traffic N:U:U:U:U"); + mwexec("$rrdtool update $rrddbpath$ifname$traffic N:U:U:U:U"); } $rrdupdatesh .= "\n"; @@ -301,7 +301,7 @@ function enable_rrd_graphing() { /* enter UNKNOWN values in the RRD so it knows we rebooted. */ if($g['booting']) { - exec("$rrdtool update $rrddbpath$ifname$packets N:U:U:U:U"); + mwexec("$rrdtool update $rrddbpath$ifname$packets N:U:U:U:U"); } $rrdupdatesh .= "\n"; @@ -327,7 +327,7 @@ function enable_rrd_graphing() { /* enter UNKNOWN values in the RRD so it knows we rebooted. */ if($g['booting']) { - exec("$rrdtool update $rrddbpath$ifname$wireless N:U:U:U"); + mwexec("$rrdtool update $rrddbpath$ifname$wireless N:U:U:U"); } $rrdupdatesh .= "\n"; @@ -466,7 +466,7 @@ function enable_rrd_graphing() { /* enter UNKNOWN values in the RRD so it knows we rebooted. */ if($g['booting']) { - exec("$rrdtool update $rrddbpath$ifname$states N:U:U:U:U:U"); + mwexec("$rrdtool update $rrddbpath$ifname$states N:U:U:U:U:U"); } /* the pf states gathering function. */ @@ -500,7 +500,7 @@ function enable_rrd_graphing() { /* enter UNKNOWN values in the RRD so it knows we rebooted. */ if($g['booting']) { - exec("$rrdtool update $rrddbpath$ifname$proc N:U:U:U:U:U"); + mwexec("$rrdtool update $rrddbpath$ifname$proc N:U:U:U:U:U"); } /* the CPU stats gathering function. */ @@ -538,7 +538,7 @@ function enable_rrd_graphing() { /* enter UNKNOWN values in the RRD so it knows we rebooted. */ if($g['booting']) { - exec("$rrdtool update $rrddbpath$ifname$mem N:U:U:U:U:U"); + mwexec("$rrdtool update $rrddbpath$ifname$mem N:U:U:U:U:U"); } /* the Memory stats gathering function. */ @@ -597,7 +597,7 @@ function enable_rrd_graphing() { /* enter UNKNOWN values in the RRD so it knows we rebooted. */ if($g['booting']) { - exec("$rrdtool update $rrddbpath$ifname$cellular N:U:U"); + mwexec("$rrdtool update $rrddbpath$ifname$cellular N:U:U"); } $rrdupdatesh .= "\n"; |
