diff --git a/discovery.php b/discovery.php index c70878054..3006399ff 100755 --- a/discovery.php +++ b/discovery.php @@ -23,11 +23,11 @@ require 'includes/discovery/functions.inc.php'; $start = utime(); $runtime_stats = array(); -// Observium Device Discovery $options = getopt('h:m:i:n:d::a::q'); if (!isset($options['q'])) { - echo $config['project_name_version']." Discovery\n\n"; + echo $config['project_name_version']." Discovery\n"; + echo get_last_commit()."\n"; } if (isset($options['h'])) { diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index e98c7b07e..0744d79c8 100644 --- a/includes/definitions.inc.php +++ b/includes/definitions.inc.php @@ -1633,7 +1633,7 @@ if (isset($config['enable_printers']) && $config['enable_printers']) { // // No changes below this line # // -$config['version'] = '2014.master'; +$config['version'] = '2015.master'; $config['project_name_version'] = $config['project_name'].' '.$config['version']; if (isset($config['rrdgraph_def_text'])) { diff --git a/includes/functions.php b/includes/functions.php index 0027748ee..84e95af1d 100644 --- a/includes/functions.php +++ b/includes/functions.php @@ -1227,3 +1227,7 @@ function fping($host,$params) { function function_check($function) { return function_exists($function); } + +function get_last_commit() { + return `git log -n 1|head -n1`; +}//end get_last_commit diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php index 27bf8053f..d97555d46 100644 --- a/includes/polling/functions.inc.php +++ b/includes/polling/functions.inc.php @@ -278,7 +278,8 @@ function poll_device($device, $options) { // echo("$device_end - $device_start; $device_time $device_run"); echo "Polled in $device_time seconds\n"; - d_echo('Updating '.$device['hostname'].' - '.print_r($update_array)." \n"); + d_echo('Updating '.$device['hostname']."\n"); + d_echo($update_array); $updated = dbUpdate($update_array, 'devices', '`device_id` = ?', array($device['device_id'])); if ($updated) { diff --git a/poller.php b/poller.php index 62bb94cd7..6412c37be 100755 --- a/poller.php +++ b/poller.php @@ -22,7 +22,8 @@ require 'includes/polling/functions.inc.php'; require 'includes/alerts.inc.php'; $poller_start = utime(); -echo $config['project_name_version']." Poller\n\n"; +echo $config['project_name_version']." Poller\n"; +echo get_last_commit()."\n"; $options = getopt('h:m:i:n:r::d::a::');