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

2013-08-13 Ramon Novoa <rnovoa@artica.es> 

* 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
This commit is contained in:
Ramon Novoa 2013-08-13 17:01:17 +00:00
parent 354719b67b
commit b8346a6e40
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_agents/ChangeLog
View File

@ -1,3 +1,7 @@
2013-08-13 Ramon Novoa <rnovoa@artica.es>
* unix/pandora_agent: Display proxy mode errors in the log file.
2013-07-10 Miguel de Dios <miguel.dedios@artica.es> 2013-07-10 Miguel de Dios <miguel.dedios@artica.es>
* unix/NT4/pandora_agent.conf, pc/NT4/pandora_agent.conf: set the * unix/NT4/pandora_agent.conf, pc/NT4/pandora_agent.conf: set the

8
pandora_agents/unix/pandora_agent
View File

@ -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'}; 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'); log_message ('setup', 'Proxy mode enabled');
exec ($new_process); exec ($new_process);
} }
} else { } 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) { if ($> != 0) {
launch_tentacle_proxy(); launch_tentacle_proxy();
} else { } else {
error ('Proxy mode can not be launched as root'); log_message ('Proxy mode can not be launched as root');
exit 1;
} }
} }