X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=service.cpp;h=62926989e62d6b25ef7fc3c33e2c6c93a1e6f82c;hb=f669237f05d127b88cd66d9dc2a32765ed6b2c23;hp=395e76ed89b8741a84a32798891c1553787f14a9;hpb=494e69560d82ff9d768b4f87a16b4c1ac9eb05c0;p=nssm.git

diff --git a/service.cpp b/service.cpp
index 395e76e..6292698 100644
--- a/service.cpp
+++ b/service.cpp
@@ -101,7 +101,7 @@ int install_service(char *name, char *exe, char *flags) {
     fprintf(stderr, "The full path to " NSSM " is too long!\n");
     return 3;
   }
-  if (snprintf(command, sizeof(command), "\"%s\" %s", path, NSSM_RUN) < 0) {
+  if (_snprintf(command, sizeof(command), "\"%s\" %s", path, NSSM_RUN) < 0) {
     fprintf(stderr, "Out of memory for ImagePath!\n");
     return 4;
   }
@@ -194,18 +194,7 @@ void WINAPI service_main(unsigned long argc, char **argv) {
   /* Register control handler */
   service_handle = RegisterServiceCtrlHandlerEx(NSSM, service_control_handler, 0);
   if (! service_handle) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_REGISTERSERVICECTRLHANDER_FAILED, GetLastError(), 0);
-    return;
-  }
-
-  /* Get startup parameters */
-  int ret = get_parameters(argv[0], exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir));
-  if (ret) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_PARAMETERS_FAILED, argv[0], 0);
-    service_status.dwCurrentState = SERVICE_STOPPED;
-    /* An accurate, if not particularly helpful, status */
-    service_status.dwWin32ExitCode = ERROR_SERVICE_NOT_ACTIVE;
-    SetServiceStatus(service_handle, &service_status);
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_REGISTERSERVICECTRLHANDER_FAILED, error_string(GetLastError()), 0);
     return;
   }
 
@@ -246,7 +235,7 @@ int monitor_service() {
   int ret = start_service();
   if (ret) {
     char code[16];
-    snprintf(code, sizeof(code), "%d", ret);
+    _snprintf(code, sizeof(code), "%d", ret);
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_START_SERVICE_FAILED, exe, service_name, ret, 0);
     return ret;
   }
@@ -254,7 +243,7 @@ int monitor_service() {
 
   /* Monitor service service */
   if (! RegisterWaitForSingleObject(&wait_handle, process_handle, end_service, (void *) pid, INFINITE, WT_EXECUTEONLYONCE | WT_EXECUTELONGFUNCTION)) {
-    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_REGISTERWAITFORSINGLEOBJECT_FAILED, service_name, exe, GetLastError(), 0);
+    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_REGISTERWAITFORSINGLEOBJECT_FAILED, service_name, exe, error_string(GetLastError()), 0);
   }
 
   return 0;
@@ -304,6 +293,13 @@ int start_service() {
   PROCESS_INFORMATION pi;
   ZeroMemory(&pi, sizeof(pi));
 
+  /* Get startup parameters */
+  int ret = get_parameters(service_name, exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir));
+  if (ret) {
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_PARAMETERS_FAILED, service_name, 0);
+    return stop_service(2, true, true);
+  }
+
   /* Launch executable with arguments */
   char cmd[CMD_LENGTH];
   if (_snprintf(cmd, sizeof(cmd), "%s %s", exe, flags) < 0) {
@@ -314,7 +310,7 @@ int start_service() {
   throttle_restart();
 
   if (! CreateProcess(0, cmd, 0, 0, false, 0, 0, dir, &si, &pi)) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service_name, exe, GetLastError(), 0);
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service_name, exe, error_string(GetLastError()), 0);
     return stop_service(3, true, true);
   }
   process_handle = pi.hProcess;