diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog index ed85b086f4..d76db397af 100644 --- a/pandora_agents/win32/ChangeLog +++ b/pandora_agents/win32/ChangeLog @@ -1,3 +1,11 @@ +2007-08-23 Esteban Sanchez + + * pandora_windows_service.cc: Reduced output log level in normal use. + + * main.cc: Added a new line on help output. + + * bin/PandoraAgent.exe: Updated to last commit. + 2007-08-16 Esteban Sanchez * ftp/pandora_ftp_test.[cc,h]: Added to repository. Implements a FTP diff --git a/pandora_agents/win32/bin/PandoraAgent.exe b/pandora_agents/win32/bin/PandoraAgent.exe index 87b03f6d56..f3e2fca68c 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/main.cc b/pandora_agents/win32/main.cc index c4aab26299..6f91853bfb 100644 --- a/pandora_agents/win32/main.cc +++ b/pandora_agents/win32/main.cc @@ -110,7 +110,7 @@ main (int argc, char *argv[]) { cout << "] [" << SERVICE_UNINSTALL_CMDLINE_PARAM; cout << "] [" << SSH_TEST_CMDLINE_PARAM; cout << "] [" << FTP_TEST_CMDLINE_PARAM; - cout << endl; + cout << endl << endl; cout << "Run " << argv[0] << "with " << HELP_CMDLINE_PARAM; cout << " parameter for more info." << endl; diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc index 249a415653..cbc2e8af12 100644 --- a/pandora_agents/win32/pandora_windows_service.cc +++ b/pandora_agents/win32/pandora_windows_service.cc @@ -72,6 +72,7 @@ Pandora_Windows_Service::~Pandora_Windows_Service () { if (this->modules != NULL) { delete this->modules; } + pandoraLog ("Pandora agent stopped"); } bool @@ -98,6 +99,7 @@ Pandora_Windows_Service::pandora_init () { setPandoraDebug (true); + pandoraLog ("Pandora agent started"); conf_file = Pandora::getPandoraInstallDir (); conf_file += "pandora_agent.conf"; @@ -112,8 +114,8 @@ Pandora_Windows_Service::pandora_init () { if (interval != "") { try { - interval_ms = strtoint (interval) - * 1000 /* miliseconds */; + /* miliseconds */ + interval_ms = strtoint (interval) * 1000; } catch (Invalid_Conversion e) { } } @@ -121,7 +123,7 @@ Pandora_Windows_Service::pandora_init () { srand ((unsigned) time (0)); this->setSleepTime (interval_ms); - pandoraDebug ("Init end"); + pandoraLog ("Pandora agent started"); } TiXmlElement * @@ -278,7 +280,7 @@ Pandora_Windows_Service::copyDataFile (string filename) "in configuration file."); } - pandoraLog ("Successfuly copied XML file to server."); + pandoraDebug ("Successfuly copied XML file to server."); } catch (Pandora_Exception e) { } } @@ -291,7 +293,7 @@ Pandora_Windows_Service::pandora_run () { string tmp_filename, tmp_filepath, interval; bool saved; - pandoraLog ("Run begin"); + pandoraDebug ("Run begin"); agent = getXmlHeader (); @@ -357,7 +359,7 @@ Pandora_Windows_Service::pandora_run () { /* Get the interval value (in minutes) */ interval = conf->getValue ("interval"); - pandoraLog ("Next execution on %s mins", interval.c_str ()); + pandoraLog ("Next execution on %s seconds", interval.c_str ()); return; }