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

2012-02-06 Dario Rodriguez <dario.rodriguez@artica.es> 

* util/pandora_xml_stress.pl: Fixed a problem with new version of perl
	with threads::all, also fixed a concatenation error in a string.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5493 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2012-02-06 12:06:01 +00:00
parent b807269a87
commit dde71dfaac
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2012-02-06 Dario Rodriguez <dario.rodriguez@artica.es>
* util/pandora_xml_stress.pl: Fixed a problem with new version of perl
with threads::all, also fixed a concatenation error in a string.
2012-02-06 Koichiro Kikuchi <koichiro@rworks.jp> 2012-02-06 Koichiro Kikuchi <koichiro@rworks.jp>
* lib/PandoraFMS/SNMPServer.pm: Added SNMPv2 Trap support! * lib/PandoraFMS/SNMPServer.pm: Added SNMPv2 Trap support!

4
pandora_server/util/pandora_xml_stress.pl
View File

@ -632,7 +632,7 @@ sub get_and_send_agent_conf(\@\%\@\%) {
my $timezone_offset = get_conf_token($conf, 'timezone_offset', '0'); my $timezone_offset = get_conf_token($conf, 'timezone_offset', '0');
my $module_txt = ''; my $module_txt = '';
my $temp = ''; my $temp = "";
# Create the block of modules. # Create the block of modules.
foreach my $module (@{$modules}) { foreach my $module (@{$modules}) {
@ -819,7 +819,7 @@ my $interval = get_conf_token (\%conf, 'agent_interval', '300');
log_message (\%conf, "Generating XML data files for $Agents agents from $time_from to $time_to interval $interval."); log_message (\%conf, "Generating XML data files for $Agents agents from $time_from to $time_to interval $interval.");
# Wait for all threads to finish # Wait for all threads to finish
foreach my $thr (threads->list(threads::all)) { foreach my $thr (threads->list()) {
$thr->join (); $thr->join ();
} }