From e4b5a16acc9e28e3d0262809370055d356450958 Mon Sep 17 00:00:00 2001
From: darode <drd.sqki@gmail.com>
Date: Mon, 6 Feb 2012 12:06:01 +0000
Subject: [PATCH] 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
---
pandora_server/ChangeLog | 5 +++++
pandora_server/util/pandora_xml_stress.pl | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 9fa17bd378..7b738441d2 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -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>
* lib/PandoraFMS/SNMPServer.pm: Added SNMPv2 Trap support!
diff --git a/pandora_server/util/pandora_xml_stress.pl b/pandora_server/util/pandora_xml_stress.pl
index 1099ea578d..f9d8aea06b 100755
--- a/pandora_server/util/pandora_xml_stress.pl
+++ b/pandora_server/util/pandora_xml_stress.pl
@@ -632,7 +632,7 @@ sub get_and_send_agent_conf(\@\%\@\%) {
my $timezone_offset = get_conf_token($conf, 'timezone_offset', '0');
my $module_txt = '';
- my $temp = '';
+ my $temp = "";
# Create the block of 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.");
# Wait for all threads to finish
-foreach my $thr (threads->list(threads::all)) {
+foreach my $thr (threads->list()) {
$thr->join ();
}