计划任务自动脚本运行时间

README.md

@@ -103,6 +103,7 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
 ### 版本更新 0.15.2
 
 * OpenResty升级到1.21.4.2
+* 计划任务自动脚本运行时间
 
 
 ### JSDelivr安装地址

class/core/crontab_api.py

@@ -510,6 +510,19 @@ class crontab_api:
 
             source_bin_activate = '''
 export LANG=en_US.UTF-8
+SCRIPT_RUN_TIME="0s"
+MW_ToSeconds()
+{
+    SEC=$1
+    if [ $SEC -lt 60 ]; then
+       SCRIPT_RUN_TIME="${SEC}s"
+    elif [ $SEC -ge 60 ] && [ $SEC -lt 3600 ];then
+       SCRIPT_RUN_TIME="$(( SEC / 60 ))m$(( SEC % 60 ))s"
+    elif [ $SEC -ge 3600 ]; then
+       SCRIPT_RUN_TIME="$(( SEC / 3600 ))h$(( (SEC % 3600) / 60 ))m$(( (SEC % 3600) % 60 ))s"
+    fi
+}
+START_MW_SHELL_TIME=`date +%s`
 MW_PATH=%s/bin/activate
 if [ -f $MW_PATH ];then
     source $MW_PATH
@@ -557,7 +570,10 @@ fi''' % (mw.getRunDir(),)
                 shell += '''
 echo "----------------------------------------------------------------------------"
 endDate=`date +"%Y-%m-%d %H:%M:%S"`
-echo "★[$endDate] Successful"
+END_MW_SHELL_TIME=`date +%s`
+((SHELL_COS_TIME=(${END_MW_SHELL_TIME}-${START_MW_SHELL_TIME})))
+MW_ToSeconds $SHELL_COS_TIME
+echo "★[$endDate] Successful | Script Run [$SCRIPT_RUN_TIME] "
 echo "----------------------------------------------------------------------------"
 '''
         cronPath = mw.getServerDir() + '/cron'