This commit is contained in:
2021-02-23 11:15:47 +08:00
parent 646a52f17e
commit 3831d7e9f0
2 changed files with 34 additions and 15 deletions
+16 -14
View File
@@ -13,6 +13,7 @@ use Exception;
use JetBrains\PhpStorm\Pure; use JetBrains\PhpStorm\Pure;
use Snowflake\Error\Logger; use Snowflake\Error\Logger;
use Snowflake\Exception\ComponentException;
use Snowflake\Snowflake; use Snowflake\Snowflake;
/** /**
@@ -114,6 +115,7 @@ class BaseObject implements Configure
* @param mixed $message * @param mixed $message
* @param string $method * @param string $method
* @param string $file * @param string $file
* @throws ComponentException
*/ */
public function debug(mixed $message, string $method = __METHOD__, string $file = __FILE__) public function debug(mixed $message, string $method = __METHOD__, string $file = __FILE__)
{ {
@@ -123,9 +125,8 @@ class BaseObject implements Configure
$message = "\033[35m[DEBUG][" . date('Y-m-d H:i:s') . ']: ' . $message . "\033[0m"; $message = "\033[35m[DEBUG][" . date('Y-m-d H:i:s') . ']: ' . $message . "\033[0m";
$message .= PHP_EOL; $message .= PHP_EOL;
$socket = Snowflake::getWebSocket(); $socket = Snowflake::app()->getLogger();
$socket->output($message);
$socket->sendMessage($message, $socket->setting['worker_num'] - 1);
} }
@@ -133,6 +134,7 @@ class BaseObject implements Configure
* @param mixed $message * @param mixed $message
* @param string $method * @param string $method
* @param string $file * @param string $file
* @throws ComponentException
*/ */
public function info(mixed $message, string $method = __METHOD__, string $file = __FILE__) public function info(mixed $message, string $method = __METHOD__, string $file = __FILE__)
{ {
@@ -142,15 +144,15 @@ class BaseObject implements Configure
$message = "\033[34m[INFO][" . date('Y-m-d H:i:s') . ']: ' . $message . "\033[0m"; $message = "\033[34m[INFO][" . date('Y-m-d H:i:s') . ']: ' . $message . "\033[0m";
$message .= PHP_EOL; $message .= PHP_EOL;
$socket = Snowflake::getWebSocket(); $socket = Snowflake::app()->getLogger();
$socket->output($message);
$socket->sendMessage($message, $socket->setting['worker_num'] - 1);
} }
/** /**
* @param mixed $message * @param mixed $message
* @param string $method * @param string $method
* @param string $file * @param string $file
* @throws ComponentException
*/ */
public function success(mixed $message, string $method = __METHOD__, string $file = __FILE__) public function success(mixed $message, string $method = __METHOD__, string $file = __FILE__)
{ {
@@ -161,9 +163,8 @@ class BaseObject implements Configure
$message = "\033[36m[SUCCESS][" . date('Y-m-d H:i:s') . ']: ' . $message . "\033[0m"; $message = "\033[36m[SUCCESS][" . date('Y-m-d H:i:s') . ']: ' . $message . "\033[0m";
$message .= PHP_EOL; $message .= PHP_EOL;
$socket = Snowflake::getWebSocket(); $socket = Snowflake::app()->getLogger();
$socket->output($message);
$socket->sendMessage($message, $socket->setting['worker_num'] - 1);
} }
@@ -171,6 +172,7 @@ class BaseObject implements Configure
* @param mixed $message * @param mixed $message
* @param string $method * @param string $method
* @param string $file * @param string $file
* @throws ComponentException
*/ */
public function warning(mixed $message, string $method = __METHOD__, string $file = __FILE__) public function warning(mixed $message, string $method = __METHOD__, string $file = __FILE__)
{ {
@@ -181,9 +183,9 @@ class BaseObject implements Configure
$message = "\033[33m[WARNING][" . date('Y-m-d H:i:s') . ']: ' . $message . "\033[0m"; $message = "\033[33m[WARNING][" . date('Y-m-d H:i:s') . ']: ' . $message . "\033[0m";
$message .= PHP_EOL; $message .= PHP_EOL;
$socket = Snowflake::getWebSocket();
$socket->sendMessage($message, $socket->setting['worker_num'] - 1); $socket = Snowflake::app()->getLogger();
$socket->output($message);
} }
@@ -191,6 +193,7 @@ class BaseObject implements Configure
* @param mixed $message * @param mixed $message
* @param null $method * @param null $method
* @param null $file * @param null $file
* @throws ComponentException
*/ */
public function error(mixed $message, $method = null, $file = null) public function error(mixed $message, $method = null, $file = null)
{ {
@@ -210,9 +213,8 @@ class BaseObject implements Configure
str_pad($message, $length, ' ', STR_PAD_LEFT) . "\033[0m"; str_pad($message, $length, ' ', STR_PAD_LEFT) . "\033[0m";
$message .= PHP_EOL; $message .= PHP_EOL;
$socket = Snowflake::getWebSocket(); $socket = Snowflake::app()->getLogger();
$socket->output($message);
$socket->sendMessage($message, $socket->setting['worker_num'] - 1);
} }
} }
+18 -1
View File
@@ -14,6 +14,8 @@ use Snowflake\Abstracts\Component;
use Snowflake\Abstracts\Config; use Snowflake\Abstracts\Config;
use Snowflake\Core\Json; use Snowflake\Core\Json;
use Snowflake\Snowflake; use Snowflake\Snowflake;
use Swoole\Coroutine;
use Swoole\Coroutine\Channel;
use Swoole\Process; use Swoole\Process;
use Throwable; use Throwable;
@@ -28,6 +30,21 @@ class Logger extends Component
public int $worker_id; public int $worker_id;
private Channel $channel;
public function init()
{
$this->channel = new Channel(5000);
Coroutine::create(function () {
while ($message = $this->channel->pop(-1)) {
echo $message;
}
});
}
/** /**
* @param $message * @param $message
* @param string $method * @param string $method
@@ -124,7 +141,7 @@ class Logger extends Component
*/ */
public function output($message) public function output($message)
{ {
echo $message; $this->channel->push($message);
} }