From d4269dc886775721931fe55f1ba7c929d7b5a548 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Sat, 14 Sep 2024 11:48:43 +0800 Subject: [PATCH] update --- plugins/acme_pandominassl_apply/index.py | 7 ++++++- plugins/acme_pandominassl_apply/tool_cron.py | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/acme_pandominassl_apply/index.py b/plugins/acme_pandominassl_apply/index.py index 80e9c26bb..02901f309 100755 --- a/plugins/acme_pandominassl_apply/index.py +++ b/plugins/acme_pandominassl_apply/index.py @@ -471,8 +471,11 @@ def domainList(): return mw.getJson(data) +def runHook(): + return 'run hook' + def runLog(): - return getServerDir() + '/data/redis.log' + return getServerDir() + '/data/hook.log' if __name__ == "__main__": func = sys.argv[1] @@ -516,5 +519,7 @@ if __name__ == "__main__": print(domainAdd()) elif func == 'domain_del': print(domainDel()) + elif func == 'run_hook': + print(runHook()) else: print('error') diff --git a/plugins/acme_pandominassl_apply/tool_cron.py b/plugins/acme_pandominassl_apply/tool_cron.py index 1fb8a0ed7..5e16865d3 100644 --- a/plugins/acme_pandominassl_apply/tool_cron.py +++ b/plugins/acme_pandominassl_apply/tool_cron.py @@ -82,8 +82,8 @@ logs_file=$plugin_path/${rname}.log ''' % (mw_dir, name, getServerDir(), getPluginDir()) cmd += 'echo "★【`date +"%Y-%m-%d %H:%M:%S"`】 STSRT★" >> $logs_file' + "\n" cmd += 'echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" >> $logs_file' + "\n" - cmd += 'echo "python3 $script_path/index.py update_all"' + "\n" - cmd += 'cd $mw_dir && python3 $script_path/index.py update_all' + "\n" + cmd += 'echo "python3 $script_path/index.py run_hook"' + "\n" + cmd += 'cd $mw_dir && python3 $script_path/index.py run_hook' + "\n" cmd += 'echo "【`date +"%Y-%m-%d %H:%M:%S"`】 END★" >> $logs_file' + "\n" cmd += 'echo "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" >> $logs_file' + "\n"