作者 刘锟

合并分支 'akun' 到 'master'

Akun



查看合并请求 !300
@@ -86,7 +86,9 @@ class HtmlCollect extends Command @@ -86,7 +86,9 @@ class HtmlCollect extends Command
86 if ($html == '0' || strpos($html,'404 Not Found') !== false) { 86 if ($html == '0' || strpos($html,'404 Not Found') !== false) {
87 $collect_info->status = CollectTask::STATUS_FAIL; 87 $collect_info->status = CollectTask::STATUS_FAIL;
88 $collect_info->save(); 88 $collect_info->save();
89 - echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: no html' . PHP_EOL; 89 +
  90 + $error = $html == '0' ? 'no html' : '404 not found';
  91 + echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: ' . $error . PHP_EOL;
90 sleep(2); 92 sleep(2);
91 return true; 93 return true;
92 } 94 }
@@ -88,7 +88,9 @@ class HtmlLanguageCollect extends Command @@ -88,7 +88,9 @@ class HtmlLanguageCollect extends Command
88 if ($html == '0' || strpos($html,'404 Not Found') !== false) { 88 if ($html == '0' || strpos($html,'404 Not Found') !== false) {
89 $collect_info->status = CollectTask::STATUS_FAIL; 89 $collect_info->status = CollectTask::STATUS_FAIL;
90 $collect_info->save(); 90 $collect_info->save();
91 - echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: no html' . PHP_EOL; 91 +
  92 + $error = $html == '0' ? 'no html' : '404 not found';
  93 + echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: ' . $error . PHP_EOL;
92 sleep(2); 94 sleep(2);
93 return true; 95 return true;
94 } 96 }
@@ -88,7 +88,9 @@ class HtmlLanguageSpecialCollect extends Command @@ -88,7 +88,9 @@ class HtmlLanguageSpecialCollect extends Command
88 if ($html == '0' || strpos($html,'404 Not Found') !== false) { 88 if ($html == '0' || strpos($html,'404 Not Found') !== false) {
89 $collect_info->status = CollectTask::STATUS_FAIL; 89 $collect_info->status = CollectTask::STATUS_FAIL;
90 $collect_info->save(); 90 $collect_info->save();
91 - echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: no html' . PHP_EOL; 91 +
  92 + $error = $html == '0' ? 'no html' : '404 not found';
  93 + echo 'date:' . date('Y-m-d H:i:s') . ', project_id: ' . $project_id . ', collect_id: ' . $collect_id . ', error: ' . $error . PHP_EOL;
92 sleep(2); 94 sleep(2);
93 return true; 95 return true;
94 } 96 }