X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=registry.cpp;h=7eb6112d5e90a6c1617eaac443496063363806c1;hb=636b16d3702049145143511c6461ff20bf1f245d;hp=7a7b7844d155185cccebeabdd766243569abd27f;hpb=a9269d8370b339777c32e6e4a5e5be3ad7387a1c;p=nssm.git diff --git a/registry.cpp b/registry.cpp index 7a7b784..7eb6112 100644 --- a/registry.cpp +++ b/registry.cpp @@ -239,7 +239,7 @@ void override_milliseconds(char *service_name, HKEY key, char *value, unsigned l if (! ok) *buffer = default_value; } -int get_parameters(char *service_name, char *exe, unsigned long exelen, char *flags, unsigned long flagslen, char *dir, unsigned long dirlen, char **env, unsigned long *throttle_delay, unsigned long *stop_method, STARTUPINFO *si) { +int get_parameters(char *service_name, char *exe, unsigned long exelen, char *flags, unsigned long flagslen, char *dir, unsigned long dirlen, char **env, unsigned long *throttle_delay, unsigned long *stop_method, unsigned long *kill_console_delay, unsigned long *kill_window_delay, unsigned long *kill_threads_delay, STARTUPINFO *si) { unsigned long ret; /* Get registry */ @@ -322,6 +322,11 @@ int get_parameters(char *service_name, char *exe, unsigned long exelen, char *fl *stop_method = ~0; if (stop_ok) *stop_method &= ~stop_method_skip; + /* Try to get kill delays - may fail. */ + override_milliseconds(service_name, key, NSSM_REG_KILL_CONSOLE_GRACE_PERIOD, kill_console_delay, NSSM_KILL_CONSOLE_GRACE_PERIOD, NSSM_EVENT_BOGUS_KILL_CONSOLE_GRACE_PERIOD); + override_milliseconds(service_name, key, NSSM_REG_KILL_WINDOW_GRACE_PERIOD, kill_window_delay, NSSM_KILL_WINDOW_GRACE_PERIOD, NSSM_EVENT_BOGUS_KILL_WINDOW_GRACE_PERIOD); + override_milliseconds(service_name, key, NSSM_REG_KILL_THREADS_GRACE_PERIOD, kill_threads_delay, NSSM_KILL_THREADS_GRACE_PERIOD, NSSM_EVENT_BOGUS_KILL_THREADS_GRACE_PERIOD); + /* Close registry */ RegCloseKey(key);