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

2012-02-07 Ramon Novoa <rnovoa@artica.es>

Browse Source 
* pandora_windows_service.cc: Convert tentacle_timeout to milliseconds.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5510 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2012-02-07 16:58:06 +00:00
parent 8589da3b27
commit bf54328305
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_agents/win32/ChangeLog
View File

@ -1,3 +1,7 @@
2012-02-07 Ramon Novoa <rnovoa@artica.es>
* pandora_windows_service.cc: Convert tentacle_timeout to milliseconds.
2012-02-02 Ramon Novoa <rnovoa@artica.es> 2012-02-02 Ramon Novoa <rnovoa@artica.es>
* installer/pandora.mpi: Added an uninstall action to delete * installer/pandora.mpi: Added an uninstall action to delete

3
pandora_agents/win32/pandora_windows_service.cc
View File

@ -493,6 +493,9 @@ Pandora_Windows_Service::copyTentacleDataFile (string host,
tentacle_timeout = atoi (conf->getValue ("tentacle_timeout").c_str ()); tentacle_timeout = atoi (conf->getValue ("tentacle_timeout").c_str ());
if (tentacle_timeout <= 0) { if (tentacle_timeout <= 0) {
tentacle_timeout = INFINITE; tentacle_timeout = INFINITE;
} else {
/* Convert to milliseconds */
tentacle_timeout *= 1000;
} }
if (WaitForSingleObject(pi.hProcess, tentacle_timeout) == WAIT_TIMEOUT) { if (WaitForSingleObject(pi.hProcess, tentacle_timeout) == WAIT_TIMEOUT) {