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

2013-03-11 Ramon Novoa <rnovoa@artica.es> 

* pandora_agent: Reset configuration to default values before
	  launching broker agents. Fixed bug #3519092.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7824 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2013-03-11 12:10:56 +00:00
parent 1d4b4ad5f8
commit 86fb89169f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_agents/unix/ChangeLog
View File

@ -1,3 +1,8 @@
2013-03-11 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Reset configuration to default values before
launching broker agents. Fixed bug #3519092.
2013-03-11 Koichiro Kikuchi <koichiro@rworks.jp>
* pandora_agent: Fixed bug that the send_buffered_xml_files

4
pandora_agents/unix/pandora_agent
View File

@ -115,7 +115,7 @@ my $ConfFile = 'pandora_agent.conf';
my @BrokerPid;
# Configuration tokens
my %Conf = (
my %DefaultConf = (
'server_ip' => 'localhost',
'server_path' => '/var/spool/pandora/data_in',
'logfile' =>'/var/log/pandora/pandora_agent.log',
@ -160,6 +160,7 @@ my %Conf = (
'custom_id' => '',
'url_address' => '',
);
my %Conf = %DefaultConf;
# Modules
my @Modules;
@ -1971,6 +1972,7 @@ while (1) {
@Modules = ();
@Plugins = ();
%Collections = ();
%Conf = %DefaultConf;
read_config ();
# Check for a new configuration