From b8346a6e40eb8a7be0f738daacd749092c362988 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Tue, 13 Aug 2013 17:01:17 +0000 Subject: [PATCH] 2013-08-13 Ramon Novoa * unix/pandora_agent: Display proxy mode errors in the log file. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8657 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/ChangeLog | 4 ++++ pandora_agents/unix/pandora_agent | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog index 506e9d4fdf..2125627a00 100644 --- a/pandora_agents/ChangeLog +++ b/pandora_agents/ChangeLog @@ -1,3 +1,7 @@ +2013-08-13 Ramon Novoa + + * unix/pandora_agent: Display proxy mode errors in the log file. + 2013-07-10 Miguel de Dios * unix/NT4/pandora_agent.conf, pc/NT4/pandora_agent.conf: set the diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 72c5d6b4a9..fdc3538d27 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -921,10 +921,11 @@ sub launch_tentacle_proxy () { my $new_process = "tentacle_server -b ".$Conf{'server_ip'}." -g ".$Conf{'server_port'}." -c ".$Conf{'proxy_max_connection'}." -t ".$Conf{'proxy_timeout'}; log_message ('setup', 'Proxy mode enabled'); - exec ($new_process); + exec ($new_process); } } else { - error ('You can not proxy to localhost'); + log_message ('error', 'You can not proxy to localhost'); + exit 1; } } @@ -2002,7 +2003,8 @@ if ($Conf{'proxy_mode'}) { if ($> != 0) { launch_tentacle_proxy(); } else { - error ('Proxy mode can not be launched as root'); + log_message ('Proxy mode can not be launched as root'); + exit 1; } }