2007-08-21 Sancho Lerena <slerena@gmail.com>
* conf/pandora_server.conf: Final fixes for default file. * lib/PandoraFMS/Config.pm: Fixed stupid typo in snmpconsole parameter. * bin/*: Disabled flush for each I/O (ready for production). This should be last commit before Beta2 :-) git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@607 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
parent
d0aaa05f3b
commit
06e20a910c
|
@ -1,3 +1,11 @@
|
||||||
|
2007-08-21 Sancho Lerena <slerena@gmail.com>
|
||||||
|
|
||||||
|
* conf/pandora_server.conf: Final fixes for default file.
|
||||||
|
|
||||||
|
* lib/PandoraFMS/Config.pm: Fixed stupid typo in snmpconsole parameter.
|
||||||
|
|
||||||
|
* bin/*: Disabled flush for each I/O (ready for production).
|
||||||
|
|
||||||
2007-08-06 Sancho Lerena <slerena@gmail.com>
|
2007-08-06 Sancho Lerena <slerena@gmail.com>
|
||||||
|
|
||||||
* DB.pm: Alert time support uses TIME format instead numeric (changes requested
|
* DB.pm: Alert time support uses TIME format instead numeric (changes requested
|
||||||
|
|
|
@ -37,7 +37,7 @@ use PandoraFMS::DB;
|
||||||
# FLUSH in each IO (only for debug, very slooow)
|
# FLUSH in each IO (only for debug, very slooow)
|
||||||
# ENABLED in DEBUGMODE
|
# ENABLED in DEBUGMODE
|
||||||
# DISABLE FOR PRODUCTION
|
# DISABLE FOR PRODUCTION
|
||||||
$| = 1;
|
$| = 0;
|
||||||
|
|
||||||
my %pa_config;
|
my %pa_config;
|
||||||
my @pending_task : shared;
|
my @pending_task : shared;
|
||||||
|
|
|
@ -36,7 +36,7 @@ use PandoraFMS::Tools;
|
||||||
use PandoraFMS::DB;
|
use PandoraFMS::DB;
|
||||||
|
|
||||||
# FLUSH in each IO, only for DEBUG, very slow !
|
# FLUSH in each IO, only for DEBUG, very slow !
|
||||||
$| = 1;
|
$| = 0;
|
||||||
|
|
||||||
my %pa_config;
|
my %pa_config;
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ use PandoraFMS::DB;
|
||||||
# FLUSH in each IO (only for debug, very slooow)
|
# FLUSH in each IO (only for debug, very slooow)
|
||||||
# ENABLED in DEBUGMODE
|
# ENABLED in DEBUGMODE
|
||||||
# DISABLE FOR PRODUCTION
|
# DISABLE FOR PRODUCTION
|
||||||
$| = 1;
|
$| = 0;
|
||||||
|
|
||||||
my %pa_config;
|
my %pa_config;
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ incomingdir /var/spool/pandora/data_in
|
||||||
# log_file: Main logfile for pandora_server
|
# log_file: Main logfile for pandora_server
|
||||||
# You could set file relative to base path or absolute, starting with /
|
# You could set file relative to base path or absolute, starting with /
|
||||||
|
|
||||||
log_file /var/log/pandora_server.log
|
log_file /var/log/pandora/pandora_server.log
|
||||||
|
|
||||||
# Log file for Pandora FMS SNMP console. Its generated by NetSNMP Trap daemon
|
# Log file for Pandora FMS SNMP console. Its generated by NetSNMP Trap daemon
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ snmp_logfile /var/log/pandora/pandora_snmptrap.log
|
||||||
# Error logfile: aux logfile for pandora_server errors (in Daemon mode)
|
# Error logfile: aux logfile for pandora_server errors (in Daemon mode)
|
||||||
# You could set file relative to base path or absolute, starting with /
|
# You could set file relative to base path or absolute, starting with /
|
||||||
|
|
||||||
errorlog_file /var/log/pandora_server.error
|
errorlog_file /var/log/pandora/pandora_server.error
|
||||||
|
|
||||||
# dbname: Database name (pandora by default
|
# dbname: Database name (pandora by default
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ dbname pandora
|
||||||
|
|
||||||
# dbuser: Database user name (pandora by default)
|
# dbuser: Database user name (pandora by default)
|
||||||
|
|
||||||
dbuser zhriopul
|
dbuser pandora
|
||||||
|
|
||||||
# daemon: Runs in daemon mode (background) if 1, if 0 runs in foreground
|
# daemon: Runs in daemon mode (background) if 1, if 0 runs in foreground
|
||||||
# this could be setup on command line with -D option
|
# this could be setup on command line with -D option
|
||||||
|
@ -84,7 +84,7 @@ reconserver 1
|
||||||
|
|
||||||
# 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 5
|
||||||
|
|
||||||
# Server keepalive (in seconds)
|
# Server keepalive (in seconds)
|
||||||
|
|
||||||
|
|
|
@ -34,8 +34,8 @@ our @EXPORT = qw( pandora_help_screen
|
||||||
# There is no global vars, all variables (setup) passed as hash reference
|
# There is no global vars, all variables (setup) passed as hash reference
|
||||||
|
|
||||||
# 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 = "1.3-dev";
|
my $pandora_version = "1.3beta2";
|
||||||
my $pandora_build="PS070731";
|
my $pandora_build="PS070822";
|
||||||
our $VERSION = $pandora_version." ".$pandora_build;
|
our $VERSION = $pandora_version." ".$pandora_build;
|
||||||
|
|
||||||
# Setup hash
|
# Setup hash
|
||||||
|
@ -205,7 +205,7 @@ sub pandora_loadconfig {
|
||||||
$pa_config->{"errorlogfile"} = $tbuf;
|
$pa_config->{"errorlogfile"} = $tbuf;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
elsif ($parametro =~ m/^pandora_snmp_logfile\s(.*)/i) { $pa_config->{'pandora_snmp_logfile'}= $1; }
|
elsif ($parametro =~ m/^snmp_logfile\s(.*)/i) { $pa_config->{'pandora_snmp_logfile'}= $1; }
|
||||||
elsif ($parametro =~ m/^dbname\s(.*)/i) { $pa_config->{'dbname'}= $1; }
|
elsif ($parametro =~ m/^dbname\s(.*)/i) { $pa_config->{'dbname'}= $1; }
|
||||||
elsif ($parametro =~ m/^dbuser\s(.*)/i) { $pa_config->{'dbuser'}= $1; }
|
elsif ($parametro =~ m/^dbuser\s(.*)/i) { $pa_config->{'dbuser'}= $1; }
|
||||||
elsif ($parametro =~ m/^dbpass\s(.*)/i) { $pa_config->{'dbpass'}= $1; }
|
elsif ($parametro =~ m/^dbpass\s(.*)/i) { $pa_config->{'dbpass'}= $1; }
|
||||||
|
|
Loading…
Reference in New Issue