tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

2009-01-24 Raul Mateos <raulofpandora@gmail.com>

Browse Source 
* lib/PandoraFMS/Config.pm: Changed some texts for last time. Sancho, please read diffs before commit.Use tabs instead spaces.
	* lib/PandoraFMS/Tools.pm: Header updated. Use tabs instead spaces.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1395 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2009-01-24 15:41:39 +00:00
parent 062e03ff1c
commit 537242bb12
3 changed files with 376 additions and 371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_server/ChangeLog
View File

@ -1,3 +1,10 @@
2009-01-24 Raul Mateos <raulofpandora@gmail.com>
* lib/PandoraFMS/Config.pm: Changed some texts for last time. Use tabs
instead spaces.
* lib/PandoraFMS/Tools.pm: Header updated. Use tabs instead spaces.
2009-01-21 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DB.pm: Changes in multicast change reports.
@ -11,7 +18,7 @@
* pandora_server/lib/PandoraFMS/Config.pm: Updated configuration
options.
2009-01-21 Sancho Leren <slerena@artica.es>
2009-01-21 Sancho Lerena <slerena@artica.es>
* pandora_server_upgrade: Script to upgrade to latest version
Pandora FMS server components / code.

28
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -7,8 +7,8 @@ package PandoraFMS::Config;
# Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; at version 2.
# modify it under the terms of the GNU Lesser General Public License
# as published by the Free Software Foundation; version 2.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@ -52,14 +52,14 @@ my %pa_config;
##########################################################################
sub help_screen {
printf "\nSyntax: \n\n pandora_server [ options ] < fullpathname to configuration file > \n\n";
printf "\nSyntax: \n\n pandora_server [ options ] < fullpathname to configuration file (pandora_server.conf) > \n\n";
printf "Following options are optional : \n";
printf " -v : Verbose mode activated, give more information in logfile \n";
printf " -d : Debug mode activated, give extensive information in logfile \n";
printf " -D : Daemon mode (runs in backgroup)\n";
printf " -v : Verbose mode activated. Writes more information in the logfile \n";
printf " -d : Debug mode activated. Writes extensive information in the logfile \n";
printf " -D : Daemon mode (runs in background)\n";
printf " -P <file> : Store PID to file.\n";
printf " -q : Quiet startup\n";
printf " -h : This screen, show a little help screen \n";
printf " -q : Quiet startup \n";
printf " -h : This screen. Shows a little help screen \n";
printf " \n";
exit;
}
@ -78,7 +78,7 @@ sub pandora_init {
# Load config file from command line
if ($#ARGV == -1 ){
print "I Need at least one parameter: Complete path to Pandora FMS Server configuration file. \n";
print "I need at least one parameter: Complete path to Pandora FMS Server configuration file \n";
help_screen;
exit;
}
@ -115,8 +115,8 @@ sub pandora_init {
}
}
if ($pa_config->{"pandora_path"} eq ""){
print " [ERROR] I Need at least one parameter: Complete path to Pandora FMS configuration file. \n";
print " For example: ./pandora_server /etc/pandora/pandora_server.conf\n\n";
print " [ERROR] I need at least one parameter: Complete path to Pandora FMS configuration file. \n";
print " For example: ./pandora_server /etc/pandora/pandora_server.conf \n\n";
exit;
}
}
@ -220,7 +220,7 @@ sub pandora_loadconfig {
# Check for file
if ( ! -e $archivo_cfg ) {
printf "\n [ERROR] Cannot open configuration file at $archivo_cfg. \n";
printf " Please specify a valid Pandora FMS configuration file in command line.\n";
printf " Please specify a valid Pandora FMS configuration file in command line. \n";
print " Standard configuration file is at /etc/pandora/pandora_server.conf \n";
exit 1;
}
@ -576,8 +576,7 @@ sub pandora_loadconfig {
print " [*] Pandora FMS Server [".$pa_config->{'servername'}.$pa_config->{"servermode"}."] is running and operative \n";
}
$pa_config->{'server_id'} = dame_server_id ($pa_config, $pa_config->{'servername'}.$pa_config->{"servermode"}, $dbh);
pandora_event ($pa_config, $pa_config->{'servername'}.$pa_config->{"servermode"}." going UP", 0,
0, 3, 0, 0, "system", $dbh);
pandora_event ($pa_config, $pa_config->{'servername'}.$pa_config->{"servermode"}." going UP", 0, 0, 3, 0, 0, "system", $dbh);
}
@ -588,7 +587,6 @@ sub pandora_startlog ($){
open STDERR, ">>$pa_config->{'errorlogfile'}" or die " [ERROR] Pandora FMS can't write to Errorlog. Aborting : \n $! \n";
my $time_now = &UnixDate("today","%Y/%m/%d %H:%M:%S");
print STDERR "$time_now - ".$pa_config->{'servername'}.$pa_config->{"servermode"}." Starting Pandora FMS Server. Error logging activated \n";
}
# End of function declaration
# End of defined Code

26
pandora_server/lib/PandoraFMS/Tools.pm
View File

@ -3,19 +3,19 @@ package PandoraFMS::Tools;
# Tools Package
# Pandora FMS. the Flexible Monitoring System. http://www.pandorafms.org
##########################################################################
# Copyright (c) 2004-2008 Sancho Lerena, slerena@gmail.com
# Copyright (c) 2005-2008 Artica Soluciones Tecnologicas S.L
# Copyright (c) 2004-2009 Sancho Lerena, slerena@gmail.com
# Copyright (c) 2005-2009 Artica Soluciones Tecnologicas S.L
#
#This program is free software; you can redistribute it and/or
#modify it under the terms of the GNU General Public License
#as published by the Free Software Foundation; version 2
#This program is distributed in the hope that it will be useful,
#but WITHOUT ANY WARRANTY; without even the implied warranty of
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#GNU General Public License for more details.
#You should have received a copy of the GNU General Public License
#along with this program; if not, write to the Free Software
#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public License
# as published by the Free Software Foundation; version 2
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
##########################################################################
use warnings;
@ -43,7 +43,7 @@ our @EXPORT = qw(
pandora_trash_ascii
enterprise_hook
enterprise_load
);
);
##########################################################################
## SUB pandora_trash_ascii