diff options
| author | Seth Mos <seth.mos@xs4all.nl> | 2008-12-17 08:38:51 +0000 |
|---|---|---|
| committer | Seth Mos <seth.mos@xs4all.nl> | 2008-12-17 08:38:51 +0000 |
| commit | c48790ecd1ebaf978591c6242ba4c7cebfa18884 (patch) | |
| tree | d8f53c22650fb1acb97f4dedf36d4536f8a20784 /etc | |
| parent | 133257dfa263693e945b97f8ecf387e168af0938 (diff) | |
| download | pfsense-c48790ecd1ebaf978591c6242ba4c7cebfa18884.zip pfsense-c48790ecd1ebaf978591c6242ba4c7cebfa18884.tar.gz | |
add debugging so we can see what it's doing
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/config.inc | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index b1b76c4..639e8d3 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -2073,38 +2073,44 @@ endif; exec("cd $rrddbpath;/usr/bin/find -name *-quality.rrd", $databases); rsort($databases); foreach($databases as $database) { - mwexec("$rrdtool tune {$database} -r roundtrip:delay"); + log_error("Upgrading rrd database {$rrddbpath}{$database}"); + mwexec("$rrdtool tune {$rrddbpath}{$database} -r roundtrip:delay"); } + /* let apinger recreate required files */ + setup_gateways_monitor(); /* build a list of traffic databases */ exec("cd $rrddbpath;/usr/bin/find -name *-traffic.rrd", $databases); rsort($databases); foreach($databases as $database) { + log_error("Upgrading rrd database {$rrddbpath}{$database}"); /* rename DS source */ - mwexec("$rrdtool tune {$database} -r in:inpass"); - mwexec("$rrdtool tune {$database} -r out:outpass"); + mwexec("$rrdtool tune {$rrddbpath}{$database} -r in:inpass"); + mwexec("$rrdtool tune {$rrddbpath}{$database} -r out:outpass"); /* dump contents to xml and move database out of the way */ - mwexec("$rrdtool dump {$database} > {$g['tmp_path']}/{$database}.xml"); - mwexec("mv $database {$g['tmp_path']}/$databases.backup"); + mwexec("$rrdtool dump {$rrddbpath}{$database} > {$g['tmp_path']}/{$database}.xml"); + mwexec("mv {$rrddbpath}{$database} {$g['tmp_path']}/$databases.backup"); /* let enable_rrd_graphing recreate the database and restore the contents */ enable_rrd_graphing(); - mwexec("$rrdtool restore {$g['tmp_path']}/{$database}.xml $database"); + mwexec("$rrdtool restore {$g['tmp_path']}/{$database}.xml {$rrddbpath}{$database}"); } /* build a list of packets databases */ exec("cd $rrddbpath;/usr/bin/find -name *-packets.rrd", $databases); rsort($databases); foreach($databases as $database) { + log_error("Upgrading rrd database {$rrddbpath}{$database}"); /* rename DS source */ - mwexec("$rrdtool tune {$database} -r in:inpass"); - mwexec("$rrdtool tune {$database} -r out:outpass"); + mwexec("$rrdtool tune {$rrddbpath}{$database} -r in:inpass"); + mwexec("$rrdtool tune {$rrddbpath}{$database} -r out:outpass"); /* dump contents to xml and move database out of the way */ - mwexec("$rrdtool dump {$database} > {$g['tmp_path']}/{$database}.xml"); - mwexec("mv $database {$g['tmp_path']}/$databases.backup"); + mwexec("$rrdtool dump {$rrddbpath}{$database} > {$g['tmp_path']}/{$database}.xml"); + mwexec("mv {$rrddbpath}{$database} {$g['tmp_path']}/$databases.backup"); /* let enable_rrd_graphing recreate the database and restore the contents */ enable_rrd_graphing(); - mwexec("$rrdtool restore {$g['tmp_path']}/{$database}.xml $database"); + mwexec("$rrdtool restore {$g['tmp_path']}/{$database}.xml {$rrddbpath}{$database}"); } + $config['version'] = "5.5"; } $now = date("H:i:s"); |
