diff --git a/module/solution/model.php b/module/solution/model.php index 25fc84abdd..62787c11d5 100644 --- a/module/solution/model.php +++ b/module/solution/model.php @@ -450,14 +450,15 @@ class solutionModel extends model * * @param string $message * @access public - * @return void + * @return string */ - public function saveLog(string $message) + public function saveLog(string $message): string { $errorFile = $this->app->logRoot . 'php.' . date('Ymd') . '.log.php'; - if(!is_file($errorFile)) file_put_contents($errorFile, "<\x3fphp\n die();\n\x3f>\n"); + if(!is_file($errorFile)) @file_put_contents($errorFile, "<\x3fphp\n die();\n\x3f>\n"); - file_put_contents($errorFile, $message . "\n", FILE_APPEND); + @file_put_contents($errorFile, $message . "\n", FILE_APPEND); + return $errorFile; } /** diff --git a/module/solution/test/model/savelog.php b/module/solution/test/model/savelog.php new file mode 100644 index 0000000000..6a5d636a88 --- /dev/null +++ b/module/solution/test/model/savelog.php @@ -0,0 +1,21 @@ +#!/usr/bin/env php +saveLog(); +timeout=0 +cid=1 + +- 没有日志信息 @1 +- 有日志信息 @5 + +*/ + +include dirname(__FILE__, 5) . '/test/lib/init.php'; +include dirname(__FILE__, 2) . '/solution.class.php'; + +$solutionModel = new solutionTest(); + +r($solutionModel->saveLogTest('')) && p() && e('1'); // 没有日志信息 +r($solutionModel->saveLogTest('test')) && p() && e('5'); // 有日志信息 diff --git a/module/solution/test/solution.class.php b/module/solution/test/solution.class.php index 71d476e903..1b953c0d54 100644 --- a/module/solution/test/solution.class.php +++ b/module/solution/test/solution.class.php @@ -1,5 +1,8 @@ objectModel->getLastSolution(); } + + /** + * Test saveLog method. + * + * @param string $message + * @access public + * @return int + */ + public function saveLogTest(string $message): int + { + global $app; + $errorFile = $app->logRoot . 'php.' . date('Ymd') . '.log.php'; + file_put_contents($errorFile, ''); + + $file = $this->objectModel->saveLog($message); + return strlen(file_get_contents($file)); + } }