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

2010-07-06 Ramon Novoa <rnovoa@artica.es> 

* pandora_windows_service.cc: Fixed the autotime feature. Was not
          working since tinyXML was removed.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2964 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2010-07-06 11:47:43 +00:00
parent 326999a913
commit 7095a1626b
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_agents/win32/ChangeLog
View File

@ -1,3 +1,8 @@
2010-07-06 Ramon Novoa <rnovoa@artica.es>
* pandora_windows_service.cc: Fixed the autotime feature. Was not
working since tinyXML was removed.
2010-07-05 Raul Mateos <raulfopandora@gmail.com>
* bin/pandora_agent.conf: Added example of D Drive. Added comments

22
pandora_agents/win32/pandora_windows_service.cc
View File

@ -183,7 +183,7 @@ Pandora_Windows_Service::pandora_init () {
string
Pandora_Windows_Service::getXmlHeader () {
char timestamp[20];
string agent_name, os_name, os_version, encoding, value;
string agent_name, os_name, os_version, encoding, value, xml;
time_t ctime;
struct tm *ctime_tm = NULL;
@ -197,6 +197,7 @@ Pandora_Windows_Service::getXmlHeader () {
ctime = time(0);
ctime_tm = localtime(&ctime);
value = conf->getValue ("autotime");
timestamp[0] = '\0';
if (value != "1") {
sprintf (timestamp, "%d-%02d-%02d %02d:%02d:%02d", ctime_tm->tm_year + 1900,
ctime_tm->tm_mon + 1, ctime_tm->tm_mday, ctime_tm->tm_hour,
@ -213,15 +214,22 @@ Pandora_Windows_Service::getXmlHeader () {
encoding = "ISO-8859-1";
}
return "<?xml version=\"1.0\" encoding=\"" + encoding + "\" ?>\n" +
"<agent_data agent_name=\"" + agent_name +
"\" description=\"" + conf->getValue ("description") +
"\" version=\"" + getPandoraAgentVersion () +
"\" timestamp=\"" + timestamp +
"\" interval=\"" + conf->getValue ("interval") +
xml = "<?xml version=\"1.0\" encoding=\"" + encoding + "\" ?>\n" +
"<agent_data agent_name=\"" + agent_name +
"\" description=\"" + conf->getValue ("description") +
"\" version=\"" + getPandoraAgentVersion ();
/* Skip the timestamp if autotime was enabled */
if (timestamp[0] != '\0') {
xml += "\" timestamp=\"";
xml += timestamp;
}
xml += "\" interval=\"" + conf->getValue ("interval") +
"\" os_name=\"" + os_name +
"\" os_version=\"" + os_version +
"\" group=\"" + conf->getValue ("group") + "\">\n";
return xml;
}
int