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

Change function name in pandoralog

Browse Source
This commit is contained in:
Akihiro Uchida 2015-03-05 01:44:59 +09:00
parent 83e5287613
commit fad89150ee
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_agents/win32/pandora_windows_service.cc
View File

@ -561,7 +561,7 @@ Pandora_Windows_Service::getValueFromCmdExec (string cmd_exec, int timeout)
job = CreateJobObject (&attributes, NULL); job = CreateJobObject (&attributes, NULL);
if (job == NULL) { if (job == NULL) {
pandoraLog ("getCoordinatesFromCmdExec: CreateJobObject failed. Err: %d", GetLastError ()); pandoraLog ("getValueFromCmdExec: CreateJobObject failed. Err: %d", GetLastError ());
return ""; return "";
} }
@ -569,7 +569,7 @@ Pandora_Windows_Service::getValueFromCmdExec (string cmd_exec, int timeout)
out = GetStdHandle (STD_OUTPUT_HANDLE); out = GetStdHandle (STD_OUTPUT_HANDLE);
if (! CreatePipe (&out_read, &new_stdout, &attributes, 0)) { if (! CreatePipe (&out_read, &new_stdout, &attributes, 0)) {
pandoraLog ("getCoordinatesFromCmdExec: CreatePipe failed. Err: %d", GetLastError ()); pandoraLog ("getValueFromCmdExec: CreatePipe failed. Err: %d", GetLastError ());
return ""; return "";
} }
@ -594,7 +594,7 @@ Pandora_Windows_Service::getValueFromCmdExec (string cmd_exec, int timeout)
/* Create the child process. */ /* Create the child process. */
if (CreateProcess (NULL , (CHAR *)cmd_exec.c_str (), NULL, NULL, TRUE, if (CreateProcess (NULL , (CHAR *)cmd_exec.c_str (), NULL, NULL, TRUE,
CREATE_SUSPENDED | CREATE_NO_WINDOW, NULL, NULL, &si, &pi) == 0) { CREATE_SUSPENDED | CREATE_NO_WINDOW, NULL, NULL, &si, &pi) == 0) {
pandoraLog ("getCoordinatesFromCmdExec: %s CreateProcess failed. Err: %d", pandoraLog ("getValueFromCmdExec: %s CreateProcess failed. Err: %d",
cmd_exec.c_str (), GetLastError ()); cmd_exec.c_str (), GetLastError ());
return ""; return "";
} else { } else {
@ -602,7 +602,7 @@ Pandora_Windows_Service::getValueFromCmdExec (string cmd_exec, int timeout)
unsigned long read, avail; unsigned long read, avail;
if (! AssignProcessToJobObject (job, pi.hProcess)) { if (! AssignProcessToJobObject (job, pi.hProcess)) {
pandoraLog ("getCoordinatesFromCmdExec: could not assign proccess to job (error %d)", pandoraLog ("getValueFromCmdExec: could not assign proccess to job (error %d)",
GetLastError ()); GetLastError ());
} }
ResumeThread (pi.hThread); ResumeThread (pi.hThread);
@ -622,7 +622,7 @@ Pandora_Windows_Service::getValueFromCmdExec (string cmd_exec, int timeout)
} else if(timeout < GetTickCount() - tickbase) { } else if(timeout < GetTickCount() - tickbase) {
/* STILL_ACTIVE */ /* STILL_ACTIVE */
TerminateProcess(pi.hThread, STILL_ACTIVE); TerminateProcess(pi.hThread, STILL_ACTIVE);
pandoraLog ("getCoordinatesFromCmdExec: %s timed out (retcode: %d)", cmd_exec.c_str (), STILL_ACTIVE); pandoraLog ("getValueFromCmdExec: %s timed out (retcode: %d)", cmd_exec.c_str (), STILL_ACTIVE);
break; break;
} }
} }
@ -631,11 +631,11 @@ Pandora_Windows_Service::getValueFromCmdExec (string cmd_exec, int timeout)
if (retval != 0) { if (retval != 0) {
if (! TerminateJobObject (job, 0)) { if (! TerminateJobObject (job, 0)) {
pandoraLog ("getCoordinatesFromCmdExec: TerminateJobObject failed. (error %d)", pandoraLog ("getValueFromCmdExec: TerminateJobObject failed. (error %d)",
GetLastError ()); GetLastError ());
} }
if (retval != STILL_ACTIVE) { if (retval != STILL_ACTIVE) {
pandoraLog ("getCoordinatesFromCmdExec: %s did not executed well (retcode: %d)", pandoraLog ("getValueFromCmdExec: %s did not executed well (retcode: %d)",
cmd_exec.c_str (), retval); cmd_exec.c_str (), retval);
} }
/* Close job, process and thread handles. */ /* Close job, process and thread handles. */