tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-09-23 Sancho Lerena <slerena@artica.es> 

* util/pandora_db.pl: Fixed bug when a blank space was behind
        the data in the .conf file.

        * util/pandora_diagnostic.sh,
        util/pandora_db.pl,
        util/pandora_manage.pl,
        util/pandora_dbstress.pl: Updated version strings.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4993 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2011-09-23 12:04:18 +00:00
parent 329bf6f62b
commit e5c9e716a9
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_server/ChangeLog
View File

@ -1,3 +1,13 @@
2011-09-23 Sancho Lerena <slerena@artica.es>
* util/pandora_db.pl: Fixed bug when a blank space was behind
the data in the .conf file.
* util/pandora_diagnostic.sh,
util/pandora_db.pl,
util/pandora_manage.pl,
util/pandora_dbstress.pl: Updated version strings.
2011-09-23 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/Config.pm: Updated version.

2
pandora_server/util/pandora_db.pl
View File

@ -371,7 +371,7 @@ sub pandora_load_config ($) {
open (CFG, '< ' . $conf->{'_pandora_path'}) or die ("[ERROR] Could not open configuration file: $!\n");
while (my $line = <CFG>){
next unless ($line =~ /^(\S+)\s+(.*)\s+$/);
$conf->{$1} = $2;
$conf->{$1} = clean_blank($2);
}
close (CFG);

2
pandora_server/util/pandora_dbstress.pl
View File

@ -45,7 +45,7 @@ use PandoraFMS::Core;
################################################################################
################################################################################
my $version = "3.0 PS091214";
my $version = "4.0 PS110923";
# FLUSH in each IO (only for debug, very slooow)
# ENABLED in DEBUGMODE

2
pandora_server/util/pandora_diagnostic.sh
View File

@ -12,7 +12,7 @@ LINUXINFO=`uname -a`
OUTFILE="/tmp/pandora_diag.$TIMESTAMP.data"
echo " "
echo "Pandora FMS Diagnostic Script v1.0 (c) ArticaST 2009"
echo "Pandora FMS Diagnostic Script v1.0 (c) ArticaST 2009-2011"
echo "http://pandorafms.org. This script is licensed under GPL2 terms"
echo " "
echo "Please wait while this script is collecting data"

2
pandora_server/util/pandora_manage.pl
View File

@ -26,7 +26,7 @@ use PandoraFMS::Core;
use PandoraFMS::Config;
# version: define current version
my $version = "3.2 PS101014";
my $version = "4.0 PS110923";
# Parameter
my $param;