git://git.iain.cx/iain / nssm.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Allow editing services.
[nssm.git] / registry.cpp
diff --git a/registry.cpp b/registry.cpp
index 74fe047..d226b83 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -28,7 +28,7 @@ int create_messages() {
   return 0;\r
 }\r
 \r
-int create_parameters(nssm_service_t *service) {\r
+int create_parameters(nssm_service_t *service, bool editing) {\r
   /* Get registry */\r
   TCHAR registry[KEY_LENGTH];\r
   if (_sntprintf_s(registry, _countof(registry), _TRUNCATE, NSSM_REGISTRY, service->name) < 0) {\r
@@ -63,33 +63,54 @@ int create_parameters(nssm_service_t *service) {
   /* Other non-default parameters. May fail. */\r
   unsigned long stop_method_skip = ~service->stop_method;\r
   if (stop_method_skip) set_number(key, NSSM_REG_STOP_METHOD_SKIP, stop_method_skip);\r
-  if (service->default_exit_action < NSSM_NUM_EXIT_ACTIONS) create_exit_action(service->name, exit_action_strings[service->default_exit_action]);\r
+  else if (editing) RegDeleteValue(key, NSSM_REG_STOP_METHOD_SKIP);\r
+  if (service->default_exit_action < NSSM_NUM_EXIT_ACTIONS) create_exit_action(service->name, exit_action_strings[service->default_exit_action], editing);\r
   if (service->throttle_delay != NSSM_RESET_THROTTLE_RESTART) set_number(key, NSSM_REG_THROTTLE, service->throttle_delay);\r
+  else if (editing) RegDeleteValue(key, NSSM_REG_THROTTLE);\r
   if (service->kill_console_delay != NSSM_KILL_CONSOLE_GRACE_PERIOD) set_number(key, NSSM_REG_KILL_CONSOLE_GRACE_PERIOD, service->kill_console_delay);\r
+  else if (editing) RegDeleteValue(key, NSSM_REG_KILL_CONSOLE_GRACE_PERIOD);\r
   if (service->kill_window_delay != NSSM_KILL_WINDOW_GRACE_PERIOD) set_number(key, NSSM_REG_KILL_WINDOW_GRACE_PERIOD, service->kill_window_delay);\r
+  else if (editing) RegDeleteValue(key, NSSM_REG_KILL_WINDOW_GRACE_PERIOD);\r
   if (service->kill_threads_delay != NSSM_KILL_THREADS_GRACE_PERIOD) set_number(key, NSSM_REG_KILL_THREADS_GRACE_PERIOD, service->kill_threads_delay);\r
-  if (service->stdin_path[0]) {\r
-    set_expand_string(key, NSSM_REG_STDIN, service->stdin_path);\r
+  else if (editing) RegDeleteValue(key, NSSM_REG_KILL_THREADS_GRACE_PERIOD);\r
+  if (service->stdin_path[0] || editing) {\r
+    if (service->stdin_path[0]) set_expand_string(key, NSSM_REG_STDIN, service->stdin_path);\r
+    else if (editing) RegDeleteValue(key, NSSM_REG_STDIN);\r
     if (service->stdin_sharing != NSSM_STDIN_SHARING) set_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_SHARING, service->stdin_sharing);\r
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_SHARING);\r
     if (service->stdin_disposition != NSSM_STDIN_DISPOSITION) set_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_DISPOSITION, service->stdin_disposition);\r
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_DISPOSITION);\r
     if (service->stdin_flags != NSSM_STDIN_FLAGS) set_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_FLAGS, service->stdin_flags);\r
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDIN, NSSM_REG_STDIO_FLAGS);\r
   }\r
-  if (service->stdout_path[0]) {\r
-    set_expand_string(key, NSSM_REG_STDOUT, service->stdout_path);\r
+  if (service->stdout_path[0] || editing) {\r
+    if (service->stdout_path[0]) set_expand_string(key, NSSM_REG_STDOUT, service->stdout_path);\r
+    else if (editing) RegDeleteValue(key, NSSM_REG_STDOUT);\r
     if (service->stdout_sharing != NSSM_STDOUT_SHARING) set_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_SHARING, service->stdout_sharing);\r
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_SHARING);\r
     if (service->stdout_disposition != NSSM_STDOUT_DISPOSITION) set_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_DISPOSITION, service->stdout_disposition);\r
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_DISPOSITION);\r
     if (service->stdout_flags != NSSM_STDOUT_FLAGS) set_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_FLAGS, service->stdout_flags);\r
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDOUT, NSSM_REG_STDIO_FLAGS);\r
   }\r
-  if (service->stderr_path[0]) {\r
-    set_expand_string(key, NSSM_REG_STDERR, service->stderr_path);\r
+  if (service->stderr_path[0] || editing) {\r
+    if (service->stderr_path[0]) set_expand_string(key, NSSM_REG_STDERR, service->stderr_path);\r
+    else if (editing) RegDeleteValue(key, NSSM_REG_STDERR);\r
     if (service->stderr_sharing != NSSM_STDERR_SHARING) set_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_SHARING, service->stderr_sharing);\r
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_SHARING);\r
     if (service->stderr_disposition != NSSM_STDERR_DISPOSITION) set_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_DISPOSITION, service->stderr_disposition);\r
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_DISPOSITION);\r
     if (service->stderr_flags != NSSM_STDERR_FLAGS) set_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_FLAGS, service->stderr_flags);\r
+    else if (editing) delete_createfile_parameter(key, NSSM_REG_STDERR, NSSM_REG_STDIO_FLAGS);\r
   }\r
   if (service->rotate_files) set_number(key, NSSM_REG_ROTATE, 1);\r
+  else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE);\r
   if (service->rotate_seconds) set_number(key, NSSM_REG_ROTATE_SECONDS, service->rotate_seconds);\r
+  else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_SECONDS);\r
   if (service->rotate_bytes_low) set_number(key, NSSM_REG_ROTATE_BYTES_LOW, service->rotate_bytes_low);\r
+  else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_BYTES_LOW);\r
   if (service->rotate_bytes_high) set_number(key, NSSM_REG_ROTATE_BYTES_HIGH, service->rotate_bytes_high);\r
+  else if (editing) RegDeleteValue(key, NSSM_REG_ROTATE_BYTES_HIGH);\r
 \r
   /* Environment */\r
   if (service->env) {\r
@@ -97,11 +118,13 @@ int create_parameters(nssm_service_t *service) {
       log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_ENV, error_string(GetLastError()), 0);\r
     }\r
   }\r
+  else if (editing) RegDeleteValue(key, NSSM_REG_ENV);\r
   if (service->env_extra) {\r
     if (RegSetValueEx(key, NSSM_REG_ENV_EXTRA, 0, REG_MULTI_SZ, (const unsigned char *) service->env_extra, (unsigned long) service->env_extralen * sizeof(TCHAR)) != ERROR_SUCCESS) {\r
       log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, NSSM_REG_ENV_EXTRA, error_string(GetLastError()), 0);\r
     }\r
   }\r
+  else if (editing) RegDeleteValue(key, NSSM_REG_ENV_EXTRA);\r
 \r
   /* Close registry. */\r
   RegCloseKey(key);\r
@@ -109,7 +132,7 @@ int create_parameters(nssm_service_t *service) {
   return 0;\r
 }\r
 \r
-int create_exit_action(TCHAR *service_name, const TCHAR *action_string) {\r
+int create_exit_action(TCHAR *service_name, const TCHAR *action_string, bool editing) {\r
   /* Get registry */\r
   TCHAR registry[KEY_LENGTH];\r
   if (_sntprintf_s(registry, _countof(registry), _TRUNCATE, NSSM_REGISTRY _T("\\%s"), service_name, NSSM_REG_EXIT) < 0) {\r
@@ -126,7 +149,7 @@ int create_exit_action(TCHAR *service_name, const TCHAR *action_string) {
   }\r
 \r
   /* Do nothing if the key already existed */\r
-  if (disposition == REG_OPENED_EXISTING_KEY) {\r
+  if (disposition == REG_OPENED_EXISTING_KEY && ! editing) {\r
     RegCloseKey(key);\r
     return 0;\r
   }\r
@@ -452,6 +475,19 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
   override_milliseconds(service->name, key, NSSM_REG_KILL_WINDOW_GRACE_PERIOD, &service->kill_window_delay, NSSM_KILL_WINDOW_GRACE_PERIOD, NSSM_EVENT_BOGUS_KILL_WINDOW_GRACE_PERIOD);\r
   override_milliseconds(service->name, key, NSSM_REG_KILL_THREADS_GRACE_PERIOD, &service->kill_threads_delay, NSSM_KILL_THREADS_GRACE_PERIOD, NSSM_EVENT_BOGUS_KILL_THREADS_GRACE_PERIOD);\r
 \r
+  /* Try to get default exit action. */\r
+  bool default_action;\r
+  service->default_exit_action = NSSM_EXIT_RESTART;\r
+  TCHAR action_string[ACTION_LEN];\r
+  if (! get_exit_action(service->name, 0, action_string, &default_action)) {\r
+    for (int i = 0; exit_action_strings[i]; i++) {\r
+      if (! _tcsnicmp((const TCHAR *) action_string, exit_action_strings[i], ACTION_LEN)) {\r
+        service->default_exit_action = i;\r
+        break;\r
+      }\r
+    }\r
+  }\r
+\r
   /* Close registry */\r
   RegCloseKey(key);\r
 \r
The Non-Sucking Service Manager