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

Wait until the service has stopped in the uninstaller. 

Refs #4865
This commit is contained in:
Gunnar Beutner 2014-04-20 15:47:57 +02:00
parent ad894c367a
commit 466cac1f52
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
icinga-app/icinga.cpp
View File

@ -471,12 +471,29 @@ static int SetupService(bool install, int argc, char **argv)
for (int i = 0; i < argc; i++)
szArgs += " " + Utility::EscapeShellArg(argv[i]);
SC_HANDLE schService = OpenService(schSCManager, "icinga2", DELETE | SERVICE_STOP);
SC_HANDLE schService = OpenService(schSCManager, "icinga2", DELETE | SERVICE_STOP | SERVICE_QUERY_STATUS);
if (schService != NULL) {
SERVICE_STATUS status;
ControlService(schService, SERVICE_CONTROL_STOP, &status);
double start = Utility::GetTime();
while (status.dwCurrentState != SERVICE_STOPPED) {
double end = Utility::GetTime();
if (end - start > 30) {
printf("Could not stop the service.\n");
break;
}
Utility::Sleep(5);
if (!QueryServiceStatus(schService, &status)) {
printf("QueryServiceStatus failed (%d)\n", GetLastError());
return 1;
}
}
if (!DeleteService(schService)) {
printf("DeleteService failed (%d)\n", GetLastError());
CloseServiceHandle(schService);