diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog index 7df6716349..3893865358 100644 --- a/pandora_agents/win32/ChangeLog +++ b/pandora_agents/win32/ChangeLog @@ -1,3 +1,12 @@ +2007-08-28 Esteban Sanchez + + * main.cc: Fixed an error with previous commit. + + * pandora_windows_service.cc, ftp/pandora_ftp_client.cc: Reduced log + level. + + * bin/PandoraAgent.exe: Updated to last commit. + 2007-08-27 Esteban Sanchez * pandora.cc: Updated buildname. diff --git a/pandora_agents/win32/bin/PandoraAgent.exe b/pandora_agents/win32/bin/PandoraAgent.exe index d3b45ca387..759b65bc00 100755 Binary files a/pandora_agents/win32/bin/PandoraAgent.exe and b/pandora_agents/win32/bin/PandoraAgent.exe differ diff --git a/pandora_agents/win32/ftp/pandora_ftp_client.cc b/pandora_agents/win32/ftp/pandora_ftp_client.cc index 161d082fa5..0e85be3251 100644 --- a/pandora_agents/win32/ftp/pandora_ftp_client.cc +++ b/pandora_agents/win32/ftp/pandora_ftp_client.cc @@ -143,8 +143,8 @@ Pandora_Ftp_Client::ftpFileFilename (const string remote_filename, this->curl = curl_easy_init (); if (this->curl) { - pandoraLog ("Copying %s to %s%s", filepath.c_str (), this->host.c_str (), - remote_filename.c_str ()); + pandoraDebug ("Copying %s to %s%s", filepath.c_str (), this->host.c_str (), + remote_filename.c_str ()); operation1 = "RNFR " + filename; headerlist = curl_slist_append (headerlist, operation1.c_str ()); diff --git a/pandora_agents/win32/main.cc b/pandora_agents/win32/main.cc index eaceb9d1d7..4be38cc6b2 100644 --- a/pandora_agents/win32/main.cc +++ b/pandora_agents/win32/main.cc @@ -121,8 +121,7 @@ main (int argc, char *argv[]) { return 1; } } - service->pandora_init (); - service->pandora_run (); + service->run (); delete service; diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc index cbc2e8af12..2cf3584e8a 100644 --- a/pandora_agents/win32/pandora_windows_service.cc +++ b/pandora_agents/win32/pandora_windows_service.cc @@ -99,7 +99,6 @@ Pandora_Windows_Service::pandora_init () { setPandoraDebug (true); - pandoraLog ("Pandora agent started"); conf_file = Pandora::getPandoraInstallDir (); conf_file += "pandora_agent.conf"; @@ -359,7 +358,7 @@ Pandora_Windows_Service::pandora_run () { /* Get the interval value (in minutes) */ interval = conf->getValue ("interval"); - pandoraLog ("Next execution on %s seconds", interval.c_str ()); + pandoraDebug ("Next execution on %s seconds", interval.c_str ()); return; }