tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

2011-09-26 Dario Rodriguez <dario.rodriguez@artica.es>

Browse Source 
* pandora_windows_service.cc: Fixed a problem sending XML with broker
	mode enabled (the "master" agent didn't report).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5011 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2011-09-26 17:25:53 +00:00
parent 9920e394ee
commit 3d5ffbb084
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_agents/ChangeLog
View File

@ -1,3 +1,8 @@
2011-09-26 Dario Rodriguez <dario.rodriguez@artica.es>
* pandora_windows_service.cc: Fixed a problem sending XML with broker
mode enabled (the "master" agent didn't report).
2011-09-26 Sancho Lerena <slerena@artica.es> 2011-09-26 Sancho Lerena <slerena@artica.es>
* unix/pandora_agent_installer, * unix/pandora_agent_installer,

15
pandora_agents/win32/pandora_windows_service.cc
View File

@ -1288,6 +1288,7 @@ Pandora_Windows_Service::sendXml (Pandora_Module_List *modules) {
/* Generate temporal filename */ /* Generate temporal filename */
random_integer = inttostr (rand()); random_integer = inttostr (rand());
tmp_filename = conf->getValue ("agent_name"); tmp_filename = conf->getValue ("agent_name");
if (tmp_filename == "") { if (tmp_filename == "") {
tmp_filename = Pandora_Windows_Info::getSystemName (); tmp_filename = Pandora_Windows_Info::getSystemName ();
} }
@ -1404,9 +1405,9 @@ Pandora_Windows_Service::pandora_run_broker (string config) {
module = this->modules->getCurrentValue (); module = this->modules->getCurrentValue ();
exe = module->evaluatePreconditions (); exe = module->evaluatePreconditions ();
if (exe == 0) return; if (exe == 0) return;
pandoraDebug ("Run %s", module->getName ().c_str ()); pandoraDebug ("Run %s", module->getName ().c_str ());
if (module->checkCron () == 1) { if (module->checkCron () == 1) {
module->run (); module->run ();
@ -1430,6 +1431,7 @@ this->elapsed_transfer_time += this->interval;
if (this->elapsed_transfer_time >= this->transfer_interval) { if (this->elapsed_transfer_time >= this->transfer_interval) {
this->elapsed_transfer_time = 0; this->elapsed_transfer_time = 0;
if (!server_addr.empty ()) { if (!server_addr.empty ()) {
this->sendXml (this->modules); this->sendXml (this->modules);
} }
} }
@ -1446,6 +1448,8 @@ Pandora_Windows_Service::pandora_run () {
int i, num; int i, num;
pandoraDebug ("Run begin"); pandoraDebug ("Run begin");
pandora_init();
conf = this->getConf (); conf = this->getConf ();
@ -1477,7 +1481,7 @@ Pandora_Windows_Service::pandora_run () {
Pandora_Module *module; Pandora_Module *module;
module = this->modules->getCurrentValue (); module = this->modules->getCurrentValue ();
exe = module->evaluatePreconditions (); exe = module->evaluatePreconditions ();
if (exe == 0) return; if (exe == 0) return;
@ -1485,7 +1489,7 @@ Pandora_Windows_Service::pandora_run () {
pandoraDebug ("Run %s", module->getName ().c_str ()); pandoraDebug ("Run %s", module->getName ().c_str ());
if (module->checkCron () == 1) { if (module->checkCron () == 1) {
module->run (); module->run ();
Sleep(10); Sleep(5);
} }
/* Save module data to an environment variable */ /* Save module data to an environment variable */
@ -1505,6 +1509,7 @@ Pandora_Windows_Service::pandora_run () {
if (this->elapsed_transfer_time >= this->transfer_interval) { if (this->elapsed_transfer_time >= this->transfer_interval) {
this->elapsed_transfer_time = 0; this->elapsed_transfer_time = 0;
if (!server_addr.empty ()) { if (!server_addr.empty ()) {
this->sendXml (this->modules); this->sendXml (this->modules);
} }
} }
@ -1516,7 +1521,7 @@ Pandora_Windows_Service::pandora_run () {
string all_conf[num]; string all_conf[num];
check_broker_agents(all_conf); check_broker_agents(all_conf);
for (i=0;i<num;i++){ for (i=0;i<num;i++){
pandora_init_broker(all_conf[i]); pandora_init_broker(all_conf[i]);
pandora_run_broker(all_conf[i]); pandora_run_broker(all_conf[i]);