Allow configuring throttling threshold.

[nssm.git] / nssm.cpp

diff --git a/nssm.cpp b/nssm.cpp
index 225d038..2933dea 100644 (file)
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -1,5 +1,7 @@
 #include "nssm.h"\r
 \r
+extern unsigned long tls_index;\r
+\r
 /* String function */\r
 int str_equiv(const char *a, const char *b) {\r
   int i;\r
@@ -13,10 +15,16 @@ int str_equiv(const char *a, const char *b) {
 int usage(int ret) {\r
   fprintf(stderr, "NSSM: The non-sucking service manager\n");\r
   fprintf(stderr, "Version %s, %s\n", NSSM_VERSION, NSSM_DATE);\r
-  fprintf(stderr, "Usage: nssm option [args]\n");\r
-  fprintf(stderr, "To install a service: nssm install [servicename]\n");\r
-  fprintf(stderr, "To remove a service: nssm remove [servicename]\n");\r
-  exit(ret);\r
+  fprintf(stderr, "Usage: nssm <option> [args]\n\n");\r
+  fprintf(stderr, "To show service installation GUI:\n\n");\r
+  fprintf(stderr, "        nssm install [<servicename>]\n\n");\r
+  fprintf(stderr, "To install a service without confirmation:\n\n");\r
+  fprintf(stderr, "        nssm install <servicename> <app> [<args>]\n\n");\r
+  fprintf(stderr, "To show service removal GUI:\n\n");\r
+  fprintf(stderr, "        nssm remove [<servicename>]\n\n");\r
+  fprintf(stderr, "To remove a service without confirmation:\n\n");\r
+  fprintf(stderr, "        nssm remove <servicename> confirm\n");\r
+  return(ret);\r
 }\r
 \r
 int main(int argc, char **argv) {\r
@@ -24,17 +32,25 @@ int main(int argc, char **argv) {
   if (argc == 1) exit(usage(1));\r
 \r
   /* Valid commands are install or remove */\r
-  if (str_equiv(argv[1], "install")) exit(install_service(argv[2]));\r
-  if (str_equiv(argv[1], "remove")) exit(remove_service(argv[2]));\r
+  if (str_equiv(argv[1], "install")) {\r
+    exit(pre_install_service(argc - 2, argv + 2));\r
+  }\r
+  if (str_equiv(argv[1], "remove")) {\r
+    exit(pre_remove_service(argc - 2, argv + 2));\r
+  }\r
   /* Undocumented: "run" is used to actually do service stuff */\r
   if (! str_equiv(argv[1], NSSM_RUN)) exit(usage(2));\r
 \r
+  /* Thread local storage for error message buffer */\r
+  tls_index = TlsAlloc();\r
+\r
+  /* Register messages */\r
+  create_messages();\r
+\r
   /* Start service magic */\r
   SERVICE_TABLE_ENTRY table[] = { { NSSM, service_main }, { 0, 0 } };\r
   if (! StartServiceCtrlDispatcher(table)) {\r
-    char *message = error_string(GetLastError());\r
-    eventprintf(EVENTLOG_ERROR_TYPE, "StartServiceCtrlDispatcher() failed: %s", message);\r
-    if (message) LocalFree(message);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DISPATCHER_FAILED, error_string(GetLastError()), 0);\r
     return 100;\r
   }\r
 \r