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

Make sure that --scm-install doesn't fail when the service already exists 

fixes #9255
This commit is contained in:
Gunnar Beutner 2015-05-12 14:39:44 +02:00
parent 4f423946a2
commit 2514ac2aea
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
icinga-app/icinga.cpp
View File

@ -497,7 +497,7 @@ static int SetupService(bool install, int argc, char **argv)
for (int i = 0; i < argc; i++) for (int i = 0; i < argc; i++)
szArgs += " " + Utility::EscapeShellArg(argv[i]); szArgs += " " + Utility::EscapeShellArg(argv[i]);
SC_HANDLE schService = OpenService(schSCManager, "icinga2", DELETE | SERVICE_STOP | SERVICE_QUERY_STATUS); SC_HANDLE schService = OpenService(schSCManager, "icinga2", SERVICE_ALL_ACCESS);
if (schService != NULL) { if (schService != NULL) {
SERVICE_STATUS status; SERVICE_STATUS status;
@ -519,21 +519,7 @@ static int SetupService(bool install, int argc, char **argv)
return 1; return 1;
} }
} }
} else if (install) {
if (!DeleteService(schService)) {
printf("DeleteService failed (%d)\n", GetLastError());
CloseServiceHandle(schService);
CloseServiceHandle(schSCManager);
return 1;
}
if (!install)
printf("Service uninstalled successfully\n");
CloseServiceHandle(schService);
}
if (install) {
schService = CreateService( schService = CreateService(
schSCManager, schSCManager,
"icinga2", "icinga2",
@ -553,11 +539,25 @@ static int SetupService(bool install, int argc, char **argv)
printf("CreateService failed (%d)\n", GetLastError()); printf("CreateService failed (%d)\n", GetLastError());
CloseServiceHandle(schSCManager); CloseServiceHandle(schSCManager);
return 1; return 1;
} else }
printf("Service installed successfully\n"); } else {
printf("Service isn't installed.\n");
CloseServiceHandle(schSCManager);
return 0;
}
if (!install) {
if (!DeleteService(schService)) {
printf("DeleteService failed (%d)\n", GetLastError());
CloseServiceHandle(schService);
CloseServiceHandle(schSCManager);
return 1;
}
printf("Service uninstalled successfully\n");
} else {
ChangeServiceConfig(schService, SERVICE_NO_CHANGE, SERVICE_AUTO_START, ChangeServiceConfig(schService, SERVICE_NO_CHANGE, SERVICE_AUTO_START,
SERVICE_ERROR_NORMAL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); SERVICE_ERROR_NORMAL, szArgs.CStr(), NULL, NULL, NULL, NULL, NULL, NULL);
SERVICE_DESCRIPTION sdDescription = { "The Icinga 2 monitoring application" }; SERVICE_DESCRIPTION sdDescription = { "The Icinga 2 monitoring application" };
ChangeServiceConfig2(schService, SERVICE_CONFIG_DESCRIPTION, &sdDescription); ChangeServiceConfig2(schService, SERVICE_CONFIG_DESCRIPTION, &sdDescription);
@ -569,9 +569,10 @@ static int SetupService(bool install, int argc, char **argv)
return 1; return 1;
} }
CloseServiceHandle(schService); printf("Service installed successfully\n");
} }
CloseServiceHandle(schService);
CloseServiceHandle(schSCManager); CloseServiceHandle(schSCManager);
return 0; return 0;