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

2009-10-13 Sancho Lerena <slerena@artica.es> 

* util/pandora_server: Incremented shutting down grace time to 60 secs
        because in some systems could take a lot of time to close all threads.

        * conf/pandora_server.conf: Better defaults for Pandora FMS server default
        install.

        * Config.pm: Hey, this is officially RC1....



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2018 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2009-10-13 22:47:53 +00:00
parent c1832c34e9
commit 80160587a7
4 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_server/ChangeLog
View File

@ -1,5 +1,13 @@
2009-10-13 Sancho Lerena <slerena@artica.es> 2009-10-13 Sancho Lerena <slerena@artica.es>
* util/pandora_server: Incremented shutting down grace time to 60 secs
because in some systems could take a lot of time to close all threads.
* conf/pandora_server.conf: Better defaults for Pandora FMS server default
install.
* Config.pm: Hey, this is officially RC1....
* pandora_server_installer: Fixed usage of old pathnames /usr/share/pandora * pandora_server_installer: Fixed usage of old pathnames /usr/share/pandora
Fixed name of pandora_db cron.daily entry. Fixed name of pandora_db cron.daily entry.

24
pandora_server/conf/pandora_server.conf
View File

@ -9,7 +9,7 @@
# if not given, it takes hostname. It's preferable to setup one # if not given, it takes hostname. It's preferable to setup one
# because machine name could change by some reason. # because machine name could change by some reason.
#servername endor #servername adama
# incomingdir: Defines directory where incoming data packets are stored # incomingdir: Defines directory where incoming data packets are stored
# You could set directory relative to base path or absolute, starting with / # You could set directory relative to base path or absolute, starting with /
@ -82,24 +82,24 @@ dataserver 1
reconserver 1 reconserver 1
# pluginserver : 1 or 0. Set to 1 to activate plugin server with this setup # pluginserver : 1 or 0. Set to 1 to activate plugin server with this setup
# DISABLED BY DEFAULT
pluginserver 1 pluginserver 0
# Pandora FMS Plugin exec tool filepath (by default at /usr/local/bin) # Pandora FMS Plugin exec tool filepath (by default at /usr/local/bin)
plugin_exec /usr/local/bin/pandora_exec plugin_exec /usr/local/bin/pandora_exec
# predictionserver : 1 or 0. Set to 1 to activate prediction server with this setup # predictionserver : 1 or 0. Set to 1 to activate prediction server with this setup
# DISABLED BY DEFAULT
predictionserver 1 predictionserver 0
# wmiserver : 1 or 0. Set to 1 to activate WMI server with this setup # wmiserver : 1 or 0. Set to 1 to activate WMI server with this setup
# DISABLED BY DEFAULT
wmiserver 1 wmiserver 0
# Network timeout (in seconds) for timeout in network connections for Network agents # Network timeout (in seconds) for timeout in network connections for Network agents
network_timeout 3 network_timeout 2
# Server keepalive (in seconds) # Server keepalive (in seconds)
@ -107,7 +107,7 @@ server_keepalive 45
# Server Threshold: defines number of seconds of main loop (in sec) # Server Threshold: defines number of seconds of main loop (in sec)
server_threshold 5 server_threshold 1
# Network threads: Do not set too high (~40). Each threads make a network module check. # Network threads: Do not set too high (~40). Each threads make a network module check.
@ -116,7 +116,7 @@ network_threads 5
# icmp_checks x : defines number of pings for each icmp_proc module type. at least one of # icmp_checks x : defines number of pings for each icmp_proc module type. at least one of
# that ping should be 1 to report 1 # that ping should be 1 to report 1
icmp_checks 2 icmp_checks 1
# tcp specific options : # tcp specific options :
# tcp_checks: number of tcp retries if first attempt fails. # tcp_checks: number of tcp retries if first attempt fails.
@ -223,3 +223,7 @@ max_queue_files 250
# Use the XML file last modification time as timestamp. # Use the XML file last modification time as timestamp.
# use_xml_timestamp 1 # use_xml_timestamp 1
# Pandora FMS will autorestart itself each XXX seconds, use this if you experience problems with
# shutting down threads, or other stability problems.
# auto_restart 86400

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

@ -36,8 +36,8 @@ our @EXPORT = qw(
); );
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "3.0-dev"; my $pandora_version = "3.0RC1";
my $pandora_build = "PS090928"; my $pandora_build = "PS091013";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

4
pandora_server/util/pandora_server
View File

@ -89,12 +89,12 @@ case "$1" in
kill $PANDORA_PID > /dev/null 2>&1 kill $PANDORA_PID > /dev/null 2>&1
COUNTER=0 COUNTER=0
while [ $COUNTER -lt 10 ] while [ $COUNTER -lt 60 ]
do do
PANDORA_PID=`pidof_pandora` PANDORA_PID=`pidof_pandora`
if [ -z "$PANDORA_PID" ] if [ -z "$PANDORA_PID" ]
then then
COUNTER=10 COUNTER=60
fi fi
COUNTER=`expr $COUNTER + 1` COUNTER=`expr $COUNTER + 1`
sleep 1 sleep 1