From d49e893a0ab322f24625f14a942b394464595a67 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Sat, 22 Apr 2017 14:10:15 +0100
Subject: [PATCH] move version info into debug to save exec calls under normal
 use (#6407)

---
 discovery.php | 23 ++++++++++++++---------
 poller.php    | 24 ++++++++++++++----------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/discovery.php b/discovery.php
index 9deffb4b76..e32b2f2521 100755
--- a/discovery.php
+++ b/discovery.php
@@ -20,15 +20,6 @@ $options       = getopt('h:m:i:n:d::v::a::q', array('os:','type:'));
 
 if (!isset($options['q'])) {
     echo $config['project_name_version']." Discovery\n";
-    $versions = version_info(false);
-    echo "Version info:\n";
-    $cur_sha = $versions['local_sha'];
-    echo "Commit SHA: $cur_sha\n";
-    echo "DB Schema: ".$versions['db_schema']."\n";
-    echo "PHP: ".$versions['php_ver']."\n";
-    echo "MySQL: ".$versions['mysql_ver']."\n";
-    echo "RRDTool: ".$versions['rrdtool_ver']."\n";
-    echo "SNMP: ".$versions['netsnmp_ver']."\n";
 }
 
 if (isset($options['h'])) {
@@ -71,6 +62,20 @@ if (isset($options['i']) && $options['i'] && isset($options['n'])) {
 }
 
 if (isset($options['d']) || isset($options['v'])) {
+    $versions = version_info(false);
+    echo <<<EOH
+===================================
+Version info:
+Commit SHA: {$versions['local_sha']}
+Commit Date: {$versions['local_date']}
+DB Schema: {$versions['db_schema']}
+PHP: {$versions['php_ver']}
+MySQL: {$versions['mysql_ver']}
+RRDTool: {$versions['rrdtool_ver']}
+SNMP: {$versions['netsnmp_ver']}
+==================================
+EOH;
+
     echo "DEBUG!\n";
     if (isset($options['v'])) {
         $vdebug = true;
diff --git a/poller.php b/poller.php
index 5499669a7a..186f3b52b8 100755
--- a/poller.php
+++ b/poller.php
@@ -16,16 +16,6 @@ require __DIR__ . '/includes/init.php';
 
 $poller_start = microtime(true);
 echo $config['project_name_version']." Poller\n";
-$versions = version_info(false);
-echo "Version info:\n";
-$cur_sha = $versions['local_sha'];
-echo "Commit SHA: $cur_sha\n";
-echo "Commit Date: ".$versions['local_date']."\n";
-echo "DB Schema: ".$versions['db_schema']."\n";
-echo "PHP: ".$versions['php_ver']."\n";
-echo "MySQL: ".$versions['mysql_ver']."\n";
-echo "RRDTool: ".$versions['rrdtool_ver']."\n";
-echo "SNMP: ".$versions['netsnmp_ver']."\n";
 
 $options = getopt('h:m:i:n:r::d::v::a::f::q');
 
@@ -85,6 +75,20 @@ if (!$where) {
 }
 
 if (isset($options['d']) || isset($options['v'])) {
+    $versions = version_info(false);
+    echo <<<EOH
+===================================
+Version info:
+Commit SHA: {$versions['local_sha']}
+Commit Date: {$versions['local_date']}
+DB Schema: {$versions['db_schema']}
+PHP: {$versions['php_ver']}
+MySQL: {$versions['mysql_ver']}
+RRDTool: {$versions['rrdtool_ver']}
+SNMP: {$versions['netsnmp_ver']}
+==================================
+EOH;
+
     echo "DEBUG!\n";
     if (isset($options['v'])) {
         $vdebug = true;