From 341928b8dd6c0d94dff0e2f209e085c115eb8e78 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Wed, 4 Feb 2015 15:59:39 +0100 Subject: [PATCH] Add util to the PATH before launching the proxy. Fixes ticket #1175. (cherry picked from commit 787b76bb492a4c5d86204478205a11fb764b13b1) --- .../win32/pandora_windows_service.cc | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc index f58f203c98..3522c041cc 100644 --- a/pandora_agents/win32/pandora_windows_service.cc +++ b/pandora_agents/win32/pandora_windows_service.cc @@ -265,22 +265,6 @@ Pandora_Windows_Service::pandora_init () { debug = conf->getValue ("debug"); setPandoraDebug (is_enabled (debug)); - /*Check if proxy mode is set*/ - proxy_mode = conf->getValue ("proxy_mode"); - if (proxy_mode != "" && this->tentacle_proxy == false) { - launchTentacleProxy(); - } - - /* Launch UDP Server */ - udp_server_enabled = conf->getValue ("udp_server"); - if (udp_server_enabled.compare ("1") == 0 && this->udp_server == NULL) { - udp_server_port = conf->getValue ("udp_server_port"); - udp_server_addr = conf->getValue ("udp_server_address"); - udp_server_auth_addr = conf->getValue ("udp_server_auth_address"); - this->udp_server = new UDP_Server (this, udp_server_addr, udp_server_auth_addr, atoi (udp_server_port.c_str ())); - ((UDP_Server *)this->udp_server)->start (); - } - if (first_run == 1) { first_run = 0; @@ -296,6 +280,22 @@ Pandora_Windows_Service::pandora_init () { pandoraLog ("Pandora agent started"); } + + /*Check if proxy mode is set*/ + proxy_mode = conf->getValue ("proxy_mode"); + if (proxy_mode != "" && this->tentacle_proxy == false) { + launchTentacleProxy(); + } + + /* Launch UDP Server */ + udp_server_enabled = conf->getValue ("udp_server"); + if (udp_server_enabled.compare ("1") == 0 && this->udp_server == NULL) { + udp_server_port = conf->getValue ("udp_server_port"); + udp_server_addr = conf->getValue ("udp_server_address"); + udp_server_auth_addr = conf->getValue ("udp_server_auth_address"); + this->udp_server = new UDP_Server (this, udp_server_addr, udp_server_auth_addr, atoi (udp_server_port.c_str ())); + ((UDP_Server *)this->udp_server)->start (); + } } int