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

2008-06-11 Esteban Sanchez <estebans@artica.es> 

* pandora_windows_service.cc, modules/pandora_module_list.cc: Deleted
        debug output.

        * modules/pandora_module_exec.cc: Reindented the code. Add blank
        output to the module if there were nothing to read (like when the
        executions return nothing).

        * bin/PandoraAgent.exe: Updated to commit.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@854 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
esanchezm 2008-06-11 14:58:53 +00:00
parent 48ed82ba8c
commit 6d05eec1c6
6 changed files with 126 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_agents/win32/ChangeLog
View File

@ -1,3 +1,14 @@
2008-06-11 Esteban Sanchez <estebans@artica.es>
* pandora_windows_service.cc, modules/pandora_module_list.cc: Deleted
debug output.
* modules/pandora_module_exec.cc: Reindented the code. Add blank
output to the module if there were nothing to read (like when the
executions return nothing).
* bin/PandoraAgent.exe: Updated to commit.
2008-06-11 Esteban Sanchez <estebans@artica.es>
* bin/libodbc++.dll: Added to repository. Needed to run agent since

BIN
pandora_agents/win32/bin/PandoraAgent.exe
View File

Binary file not shown.

1
pandora_agents/win32/modules/pandora_module.cc
View File

@ -295,7 +295,6 @@ Pandora_Module::getXml () {
string item_clean, data_clean, desc_clean;
Pandora_Data *data;
pandoraDebug ("%s getXML begin", module_name.c_str ());
if (!this->has_output || (this->data_list && this->data_list->size () < 1)) {

4
pandora_agents/win32/modules/pandora_module_exec.cc
View File

@ -63,7 +63,7 @@ Pandora_Module_Exec::run () {
attributes.lpSecurityDescriptor = NULL;
/* Create a job to kill the child tree if it become zombie */
/* CAUTION: In order to work this, WINVER should be defined to 0x0500.
/* CAUTION: In order to compile this, WINVER should be defined to 0x0500.
This may need no change, since it was redefined by the
program, but if needed, the macro is defined
in <windef.h> */
@ -148,6 +148,8 @@ Pandora_Module_Exec::run () {
output += (char *) buffer;
} while (read >= BUFSIZE);
this->setOutput (output);
} else {
this->setOutput ("");
}
/* Close job, process and thread handles. */

1
pandora_agents/win32/modules/pandora_module_list.cc
View File

@ -119,7 +119,6 @@ Pandora_Modules::Pandora_Module_List::parseModuleDefinition (string definition)
module = Pandora_Module_Factory::getModuleFromDefinition (definition);
if (module != NULL) {
cout << module->getModuleKind () << endl;
switch (module->getModuleKind ()) {
case MODULE_EXEC:
module_exec = (Pandora_Module_Exec *) module;

3
pandora_agents/win32/pandora_windows_service.cc
View File

@ -135,7 +135,6 @@ Pandora_Windows_Service::pandora_init () {
this->transfer_interval = this->interval;
}
}
cout << "trans: " << this->transfer_interval << endl;
srand ((unsigned) time (0));
this->setSleepTime (this->interval);
@ -631,7 +630,7 @@ Pandora_Windows_Service::pandora_run () {
}
this->elapsed_transfer_time += interval;
cout << "interval time: " << interval << " transfer time:" << this->transfer_interval << " time passed: " << this->elapsed_transfer_time << endl;
if (this->elapsed_transfer_time >= this->transfer_interval) {
agent = getXmlHeader ();