Project

General

Profile

« Previous | Next » 

Revision a87afa7c

Added by Seth Mos about 16 years ago

Revert mwexec back to exec. They are very different functions.
mwexec() has a mute flag which can be true or false, exec, returns a
array in the 2nd argument and the return code in the 3rd.
We require the output from the command.

View differences:

etc/inc/upgrade_config.inc
1560 1560
	}
1561 1561
	/* the roundtrip times need to be divided by 1000 to get seconds, really */
1562 1562
	$databases = array();
1563
	mwexec("cd $rrddbpath;/usr/bin/find *-quality.rrd", $databases);
1563
	exec("cd $rrddbpath;/usr/bin/find *-quality.rrd", $databases);
1564 1564
	rsort($databases);
1565 1565
	foreach($databases as $database) {
1566 1566
		$xmldump = "{$database}.old.xml";
......
1595 1595

  
1596 1596
	/* build a list of traffic and packets databases */
1597 1597
	$databases = array();
1598
	mwexec("cd $rrddbpath;/usr/bin/find *-traffic.rrd *-packets.rrd", $databases);
1598
	exec("cd $rrddbpath;/usr/bin/find *-traffic.rrd *-packets.rrd", $databases);
1599 1599
	rsort($databases);
1600 1600
	foreach($databases as $database) {
1601 1601
		$databasetmp = "{$database}.tmp";

Also available in: Unified diff