From c03155d9b030c5cc65912440f63f7a10e1611c15 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Fri, 17 Jun 2022 21:48:48 +0800
Subject: [PATCH] =?UTF-8?q?supervisor=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/supervisor/index.py                  | 2 ++
 plugins/supervisor/init.d/supervisor.service | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/supervisor/index.py b/plugins/supervisor/index.py
index b06c6b660..5185dfe4b 100755
--- a/plugins/supervisor/index.py
+++ b/plugins/supervisor/index.py
@@ -103,8 +103,10 @@ def initDreplace():
         mw.writeFile(conf, conf_content)
 
     if os.path.exists(systemDir) and not os.path.exists(systemService):
+        supervisord_bin = mw.execShell('which supervisord')[0].strip()
         se_content = mw.readFile(systemServiceTpl)
         se_content = se_content.replace('{$SERVER_PATH}', service_path)
+        se_content = se_content.replace('{$SUP_BIN}', supervisord_bin)
         mw.writeFile(systemService, se_content)
         mw.execShell('systemctl daemon-reload')
 
diff --git a/plugins/supervisor/init.d/supervisor.service b/plugins/supervisor/init.d/supervisor.service
index 41f4fe569..6f023e398 100644
--- a/plugins/supervisor/init.d/supervisor.service
+++ b/plugins/supervisor/init.d/supervisor.service
@@ -5,8 +5,8 @@ After=network.target
 [Service]
 Type=forking
 ExecStart=supervisord -c {$SERVER_PATH}/supervisor/supervisor.conf
-ExecStop=supervisorctl -c {$SERVER_PATH}/supervisor/supervisor.conf $OPTIONS shutdown
-ExecReload=supervisorctl -c {$SERVER_PATH}/supervisor/supervisor.conf $OPTIONS reload
+ExecStop=/bin/kill -s TERM $MAINPID
+ExecReload=/bin/kill -s HUP $MAINPID
 KillMode=process
 Restart=on-failure