dev

crontab/control/control.php

@@ -12,11 +12,11 @@ defined('InShopNC') or exit('Access Invalid!');
 class BaseCronControl
 {
     public function shutdown(){
-        //exit("shutdown at ".date('Y-m-d H:i:s',time())."\n");
+//        exit("shutdown at ".date('Y-m-d H:i:s',time())."\n");
     }
 
     public function __construct(){
-        //register_shutdown_function(array($this,"shutdown"));
+//        register_shutdown_function(array($this,"shutdown"));
     }
 
     /**
@@ -24,7 +24,8 @@ class BaseCronControl
      * @param unknown $content 日志内容
      * @param boolean $if_sql 是否记录SQL
      */
-    protected function log($content, $if_sql = true) {
+    protected function log($content, $if_sql = true)
+    {
         if ($if_sql) {
             $log = Log::read();
             if (!empty($log) && is_array($log)){

crontab/control/minutes.php

@@ -43,6 +43,14 @@ class minutesControl extends BaseCronControl
 //        $this->_SendOrderQuery();
     }
 
+    //任务队列处理
+    public function admin_taskOp()
+    {
+        Log::short_name('task');
+        Log::record('start task',Log::DEBUG);
+        $this->exec_task(false);
+    }
+
     public function update_channel_balanceOp()
     {
         $balance_getter = function ($provider_id)
@@ -430,15 +438,6 @@ class minutesControl extends BaseCronControl
             sleep(1);
         }
     }
-
-    //任务队列处理
-    public function admin_taskOp()
-    {
-        Log::short_name('task');
-        Log::record('start task',Log::DEBUG);
-        $this->exec_task(false);
-    }
-
     //任务队列处理
     public function merchant_taskOp()
     {

docker/compose/workcuda/slave-crond/docker-compose.yml

@@ -22,28 +22,12 @@ services:
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
+      - ../conf/php/php-debug.ini:/usr/local/etc/php/php.ini
       - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
       - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-taska"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','task']
-    deploy:
-      resources:
-        limits:
-          cpus: '8'
-
-  taskb:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
-      - /mnt/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-taskb"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','task']
+    command: [php,"/var/www/html/crontab/index.php",'minutes','admin_task']
     deploy:
       resources:
         limits: