fixed some bugs

ppanphper · Oct 31, 2019 · 2aacdd4 · 2aacdd4
1 parent 92a282a
commit 2aacdd4
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 29 deletions.
diff --git a/agent/Libs/DbLog.php b/agent/Libs/DbLog.php
@@ -173,13 +173,13 @@ private static function writeLog($logPrefix)
                         }
                         // 存储日志
                         if (!Logs::saveLog([
-                            'task_id'      => $originLog['taskId'],
-                            'run_id'       => $originLog['runId'],
-                            'code'         => $originLog['code'],
-                            'title'        => $originLog['title'],
-                            'msg'          => $msg,
-                            'consume_time' => $originLog['consumeTime'],
-                            'created'      => $originLog['created'],
+                            'taskId'        => $originLog['taskId'],
+                            'runId'         => $originLog['runId'],
+                            'code'          => $originLog['code'],
+                            'title'         => $originLog['title'],
+                            'msg'           => $msg,
+                            'consumeTime'   => $originLog['consumeTime'],
+                            'created'       => $originLog['created'],
                         ])) {
                             if (!isset($originLog['retryCount'])) {
                                 $originLog['retryCount'] = 0;

diff --git a/agent/Libs/LoadTasks.php b/agent/Libs/LoadTasks.php
@@ -114,28 +114,34 @@ public static function load($loadSpecifiedIds = [])
         $offset = 0;
         $limit = 1000;
         $agentId = isset($agentInfo['id']) ? $agentInfo['id'] : 0;
-        while (true) {
+        $keepLoop = true;
+        while ($keepLoop) {
             // 获取当前节点需要执行的任务数据
             $tasks = Crontab::getCurrentNodeTaskData($agentId, $loadSpecifiedIds, Crontab::STATUS_ENABLED, $offset, $limit);
             if (empty($tasks)) break;
             foreach ($tasks as $task) {
-                // 如果节点加载任务数量没有超限
-                if (count(self::$_table) <= TASK_MAX_LOAD_SIZE) {
-                    self::$_table->set($task['id'], [
-                        'name'          => $task['name'],
-                        'rule'          => $task['rule'],
-                        'execNum'       => $task['concurrency'],
-                        'maxTime'       => $task['max_process_time'],
-                        'timeoutOpt'    => $task['timeout_opt'],
-                        'logOpt'        => $task['log_opt'],
-                        'runUser'       => $task['run_user'],
-                        'command'       => $task['command'],
-                        'retries'       => $task['retries'],
-                        'retryInterval' => $task['retry_interval'],
-                        'noticeWay'     => $task['notice_way'],
-                        'updateTime'    => $task['update_time'],
-                    ]);
+
+                if (count(self::$_table) > TASK_MAX_LOAD_SIZE) {
+                    // 达到最大加载任务数，就终止加载
+                    $keepLoop = false;
+                    break;
                 }
+
+                // 如果内存不够，会出现 Swoole_table::set(): unable to allocate memory
+                self::$_table->set($task['id'], [
+                    'name'          => $task['name'],
+                    'rule'          => $task['rule'],
+                    'execNum'       => $task['concurrency'],
+                    'maxTime'       => $task['max_process_time'],
+                    'timeoutOpt'    => $task['timeout_opt'],
+                    'logOpt'        => $task['log_opt'],
+                    'runUser'       => $task['run_user'],
+                    'command'       => $task['command'],
+                    'retries'       => $task['retries'],
+                    'retryInterval' => $task['retry_interval'],
+                    'noticeWay'     => $task['notice_way'],
+                    'updateTime'    => $task['update_time'],
+                ]);
             }
             $offset += $limit;
         }

diff --git a/agent/Libs/Server.php b/agent/Libs/Server.php
@@ -2,7 +2,7 @@
 
 namespace Libs;
 
-use Models\DB;
+use \Models\DB;
 use \Swoole\Server as SwooleServer;
 use \Swoole\Process as SwooleProcess;
 

diff --git a/agent/Models/DB.php b/agent/Models/DB.php
@@ -14,15 +14,13 @@ class DB
 {
     private static $_dbs = [];
 
-    protected static $_defaultDBName = null;
-
     public static function init() {
         self::getInstance();
-        self::$_defaultDBName = configItem('default_select_db');
     }
 
     /**
      * 获取DB实例
+     * 注意，此方法调用在worker/process/task进程中，所以每个进程都会需要调用一次
      *
      * @param string $name
      *
@@ -32,7 +30,7 @@ public static function init() {
     public static function getInstance($name='')
     {
         // 默认数据库
-        $name = strtolower($name) ?: self::$_defaultDBName;
+        $name = strtolower($name) ?: configItem('default_select_db');;
         if (isset(self::$_dbs[$name])) {
             return self::$_dbs[$name];
         }

diff --git a/agent/agent.php b/agent/agent.php
@@ -17,6 +17,7 @@
 
 define('ROOT_PATH', __DIR__ . '/');
 define('LIBS_PATH', ROOT_PATH . 'Libs/');
+define('MODELS_PATH', ROOT_PATH . 'Models/');
 define('CONFIG_PATH', ROOT_PATH . 'Config/');
 define('TPL_PATH', ROOT_PATH . 'Tpl/');
 define('ENVIRONMENT', !empty($envInit['env']) ? $envInit['env'] : 'prod');
@@ -46,6 +47,7 @@
     }
     require_once $autoloadPath;
     Loader::addNameSpace('Libs', LIBS_PATH);
+    Loader::addNameSpace('Models', MODELS_PATH);
     Loader::register();
 }