From f63e913a0e0b994ebad1781f4f60dab1ca7a1afb Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Tue, 20 Jul 2010 13:02:54 +0000 Subject: [PATCH] $config['log_file'] = USE IT. git-svn-id: http://www.observium.org/svn/observer/trunk@1440 61d68cd4-352d-0410-923a-c4978735b2b8 --- config.php.default | 2 +- discovery.php | 2 +- includes/defaults.inc.php | 2 +- includes/polling/ports.inc.php | 5 ++++- poller.php | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/config.php.default b/config.php.default index 196bce576..219228de5 100755 --- a/config.php.default +++ b/config.php.default @@ -12,7 +12,7 @@ $config['db_name'] = "observium"; $config['install_dir'] = "/opt/observium"; $config['html_dir'] = $config['install_dir'] . "/html"; $config['rrd_dir'] = $config['install_dir'] . "/rrd"; -$config['observer_log'] = $config['install_dir'] . "/observium.log"; +$config['log_file'] = $config['install_dir'] . "/observium.log"; ### $config['base_url'] = "http://obeservium.company.com"; diff --git a/discovery.php b/discovery.php index 4ffabe5ba..b83401aaf 100755 --- a/discovery.php +++ b/discovery.php @@ -173,6 +173,6 @@ if($devices_discovered) { $string = $argv[0] . " $doing " . date("F j, Y, G:i") . " - $polled_devices devices discovered in $proctime secs"; if ($debug) echo("$string\n"); -shell_exec("echo '".$string."' >> ".$config['logfile']); +shell_exec("echo '".$string."' >> ".$config['log_file']); ?> diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php index 036b0b4ca..edca3914e 100644 --- a/includes/defaults.inc.php +++ b/includes/defaults.inc.php @@ -6,7 +6,7 @@ $config['temp_dir'] = "/tmp"; $config['install_dir'] = "/opt/observium"; $config['html_dir'] = $config['install_dir'] . "/html"; $config['rrd_dir'] = $config['install_dir'] . "/rrd"; -$config['observium_log'] = $config['install_dir'] . "/observium.log"; +$config['log_file'] = $config['install_dir'] . "/observium.log"; ### Location of executables diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php index 8088a0517..611097296 100755 --- a/includes/polling/ports.inc.php +++ b/includes/polling/ports.inc.php @@ -32,7 +32,7 @@ if($config['enable_ports_etherlike']) { echo("dot3Stats "); $array = snmp_cache_oid("dot3StatsEntry", $device, $array, "EtherLike-MIB"); } if($config['enable_ports_adsl']) { - echo("adsl "); + echo("ADSL "); $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.1.1", $device, $array, "ADSL-LINE-MIB"); $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.2.1", $device, $array, "ADSL-LINE-MIB"); $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.3.1", $device, $array, "ADSL-LINE-MIB"); @@ -95,6 +95,9 @@ $update .= ", `poll_prev` = '".$port['poll_time']."'"; $update .= ", `poll_period` = '".$polled_period."'"; + #echo("\n32bit - In: ".$this_port['ifInOctets']." Out: ".$this_port['ifOutOctets']); + #echo("\n64bit - In: ".$this_port['ifHCInOctets']." Out: ".$this_port['ifHCOutOctets']."\n"); + /// Copy ifHC[In|Out]Octets values to non-HC if they exist if($this_port['ifHCInOctets'] > 0 && is_numeric($this_port['ifHCInOctets']) && $this_port['ifHCOutOctets'] > 0 && is_numeric($this_port['ifHCOutOctets'])) { echo("HC "); diff --git a/poller.php b/poller.php index 34091808b..d18a747dd 100755 --- a/poller.php +++ b/poller.php @@ -277,6 +277,6 @@ if($polled_devices) { $string = $argv[0] . " $doing " . date("F j, Y, G:i") . " - $polled_devices devices polled in $poller_time secs"; if ($debug) echo("$string\n"); -shell_exec("echo '".$string."' >> ".$config['install_dir']."/observium.log"); # FIXME EWW +shell_exec("echo '".$string."' >> ".$config['log_file']); # FIXME EWW ?>