From 474d7775e94de51b3cb64d0169a95ddb5accb05e Mon Sep 17 00:00:00 2001 From: hkosaka Date: Tue, 12 Feb 2013 02:38:48 +0000 Subject: [PATCH] 2013-02-12 Hirofumi Kosaka * pandora_agent: Fixed bug that data transfer would fail when secondary_transfer_mode is different from transfer_mode. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7623 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/unix/ChangeLog | 5 +++++ pandora_agents/unix/pandora_agent | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog index 545a75b364..57483acd76 100644 --- a/pandora_agents/unix/ChangeLog +++ b/pandora_agents/unix/ChangeLog @@ -1,3 +1,8 @@ +2013-02-12 Hirofumi Kosaka + + * pandora_agent: Fixed bug that data transfer would fail + when secondary_transfer_mode is different from transfer_mode. + 2013-01-17 Ramon Novoa * plugins/grep_log: Merged with grep_log_module. diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index bade52ecf5..70c367e393 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -804,7 +804,7 @@ sub swap_servers () { ($Conf{'server_ip'}, $Conf{'secondary_server_ip'}) = ($Conf{'secondary_server_ip'}, $Conf{'server_ip'}); ($Conf{'server_path'}, $Conf{'secondary_server_path'}) = ($Conf{'secondary_server_path'}, $Conf{'server_path'}); ($Conf{'server_port'}, $Conf{'secondary_server_port'}) = ($Conf{'secondary_server_port'}, $Conf{'server_port'}); - ($Conf{'server_transfer_mode'}, $Conf{'secondary_server_transfer_mode'}) = ($Conf{'secondary_server_transfer_mode'}, $Conf{'server_transfer_mode'}); + ($Conf{'transfer_mode'}, $Conf{'secondary_transfer_mode'}) = ($Conf{'secondary_transfer_mode'}, $Conf{'transfer_mode'}); ($Conf{'server_pwd'}, $Conf{'secondary_server_pwd'}) = ($Conf{'secondary_server_pwd'}, $Conf{'server_pwd'}); ($Conf{'server_ssl'}, $Conf{'secondary_server_ssl'}) = ($Conf{'secondary_server_ssl'}, $Conf{'server_ssl'}); ($Conf{'server_opts'}, $Conf{'secondary_server_opts'}) = ($Conf{'secondary_server_opts'}, $Conf{'server_opts'});