mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move version info into debug to save exec calls under normal use (#6407)

Browse Source
This commit is contained in:
Neil Lathwood
2017-04-22 14:10:15 +01:00
committed by Tony Murray
parent 64e020d703
commit d49e893a0a
2 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
discovery.php
View File

@ -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;

24
poller.php
View File

@ -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;