From 6c73b18d7f549510cfd4fb5c51d33911a0168197 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Tue, 17 Mar 2020 11:45:12 -0700 Subject: [PATCH] shadowsocks: When editing configuration, don't re-enable If the app is disabled and configuration is edited, don't start the daemon. Signed-off-by: Sunil Mohan Adapa Reviewed-by: Nektarios Katakis --- actions/shadowsocks | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/actions/shadowsocks b/actions/shadowsocks index dba962827..61a98bfd5 100755 --- a/actions/shadowsocks +++ b/actions/shadowsocks @@ -107,7 +107,11 @@ def subcommand_merge_config(_): config = sys.stdin.read() config = json.loads(config) _merge_config(config) - action_utils.service_restart(shadowsocks.managed_services[0]) + + # Don't try_restart because initial configuration may not be valid so + # shadowsocks will not be running even when enabled. + if action_utils.service_is_enabled(shadowsocks.managed_services[0]): + action_utils.service_restart(shadowsocks.managed_services[0]) def main():