as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
向林
2021-11-18 15:37:11 +08:00
parent 1643a839b3
commit e3348a11c8
2 changed files with 195 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kiri-engine/Abstracts/BaseObject.php
+33 -9
View File
@@ -130,14 +130,19 @@ class BaseObject implements Configure
* @param string $file
* @throws Exception
*/
public function debug(mixed $message, string $method = __METHOD__, string $file = __FILE__)
public function debug(mixed $message, string $method = '', string $file = '')
{
if (!is_string($message)) {
$message = print_r($message, true);
}
$message = "\033[35m[" . date('Y-m-d H:i:s') . '][DEBUG]: ' . $message . "\033[0m";
$this->logger()->debug(Logger::DEBUG, [$message, $method, $file]);
$context = [];
if (!empty($method)) $context['method'] = $method;
if (!empty($file)) $context['file'] = $file;
$this->logger()->debug($message, $context);
}
@@ -147,14 +152,19 @@ class BaseObject implements Configure
* @param string $file
* @throws Exception
*/
public function info(mixed $message, string $method = __METHOD__, string $file = __FILE__)
public function info(mixed $message, string $method = '', string $file = '')
{
if (!is_string($message)) {
$message = print_r($message, true);
}
$message = "\033[34m[" . date('Y-m-d H:i:s') . '][INFO]: ' . $message . "\033[0m";
$this->logger()->info(Logger::NOTICE, [$message, $method, $file]);
$context = [];
if (!empty($method)) $context['method'] = $method;
if (!empty($file)) $context['file'] = $file;
$this->logger()->info($message, $context);
}
@@ -164,7 +174,7 @@ class BaseObject implements Configure
* @param string $file
* @throws Exception
*/
public function success(mixed $message, string $method = __METHOD__, string $file = __FILE__)
public function success(mixed $message, string $method = '', string $file = '')
{
if (!is_string($message)) {
$message = print_r($message, true);
@@ -172,7 +182,12 @@ class BaseObject implements Configure
$message = "\033[36m[" . date('Y-m-d H:i:s') . '][SUCCESS]: ' . $message . "\033[0m";
$this->logger()->notice(Logger::NOTICE, [$message, $method, $file]);
$context = [];
if (!empty($method)) $context['method'] = $method;
if (!empty($file)) $context['file'] = $file;
$this->logger()->notice($message, $context);
}
@@ -182,7 +197,7 @@ class BaseObject implements Configure
* @param string $file
* @throws Exception
*/
public function warning(mixed $message, string $method = __METHOD__, string $file = __FILE__)
public function warning(mixed $message, string $method = '', string $file = '')
{
if (!is_string($message)) {
$message = print_r($message, true);
@@ -190,7 +205,12 @@ class BaseObject implements Configure
$message = "\033[33m[" . date('Y-m-d H:i:s') . '][WARNING]: ' . $message . "\033[0m";
$this->logger()->critical(Logger::NOTICE, [$message, $method, $file]);
$context = [];
if (!empty($method)) $context['method'] = $method;
if (!empty($file)) $context['file'] = $file;
$this->logger()->critical($message, $context);
}
@@ -213,7 +233,11 @@ class BaseObject implements Configure
$message .= PHP_EOL . "\033[41;37m[" . date('Y-m-d H:i:s') . '][ERROR]: ' . $file . "\033[0m";
}
$this->logger()->error(Logger::ERROR, [$message, $method, $file]);
$context = [];
if (!empty($method)) $context['method'] = $method;
if (!empty($file)) $context['file'] = $file;
$this->logger()->error($message, $context);
}
}
kiri-engine/Error/LoggerProcess.php
+4 -14
View File
@@ -20,22 +20,16 @@ use Server\Abstracts\BaseProcess;
class LoggerProcess extends BaseProcess
{
/**
* @param Process $process
* @return string
*/
#[Pure] public function getProcessName(Process $process): string
{
// TODO: Implement getProcessName() method.
return get_called_class();
}
public string $name = 'logger process';
/**
* @param Process $process
* @throws ComponentException
*/
public function onHandler(Process $process): void
public function onProcessExec(Process $process): void
{
// TODO: Implement onHandler() method.
$this->message($process);
@@ -49,10 +43,6 @@ class LoggerProcess extends BaseProcess
*/
public function message(Process $process)
{
if ($this->checkProcessIsStop()) {
$this->exit();
return;
}
$message = Json::decode($process->read());
if (!empty($message)) {
Kiri::writeFile($this->getDirName($message), $message[0], FILE_APPEND);