2007-08-23 Esteban Sanchez <estebans@artica.es>

* 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.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@613 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
esanchezm 2007-08-23 16:22:56 +00:00
parent 2106e0d28b
commit c89f61a9d9
4 changed files with 17 additions and 7 deletions

View File

@ -1,3 +1,11 @@
2007-08-23 Esteban Sanchez <estebans@artica.es>
* 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 <estebans@artica.es>
* ftp/pandora_ftp_test.[cc,h]: Added to repository. Implements a FTP

View File

@ -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;

View File

@ -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;
}