合并分支 'akun' 到 'master'

Akun



查看合并请求 !300

@@ -86,7 +86,9 @@ class HtmlCollect extends Command
                 if ($html == '0' || strpos($html,'404 Not Found') !== false) {
                     $collect_info->status = CollectTask::STATUS_FAIL;
                     $collect_info->save();
-                    echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: no html' . PHP_EOL;
+
+                    $error = $html == '0' ? 'no html' : '404 not found';
+                    echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: ' . $error . PHP_EOL;
                     sleep(2);
                     return true;
                 }

@@ -88,7 +88,9 @@ class HtmlLanguageCollect extends Command
                 if ($html == '0' || strpos($html,'404 Not Found') !== false) {
                     $collect_info->status = CollectTask::STATUS_FAIL;
                     $collect_info->save();
-                    echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: no html' . PHP_EOL;
+
+                    $error = $html == '0' ? 'no html' : '404 not found';
+                    echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: ' . $error . PHP_EOL;
                     sleep(2);
                     return true;
                 }

@@ -88,7 +88,9 @@ class HtmlLanguageSpecialCollect extends Command
                 if ($html == '0' || strpos($html,'404 Not Found') !== false) {
                     $collect_info->status = CollectTask::STATUS_FAIL;
                     $collect_info->save();
-                    echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: no html' . PHP_EOL;
+
+                    $error = $html == '0' ? 'no html' : '404 not found';
+                    echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: ' . $error . PHP_EOL;
                     sleep(2);
                     return true;
                 }