eee

Abstracts/Server.php

@@ -4,6 +4,8 @@
 namespace Kiri\Server\Abstracts;
 
 
+use Kiri\Error\StdoutLogger;
+
 /**
  * Class Server
  * @package Server\Abstracts
@@ -19,4 +21,14 @@ abstract class Server
 	{
 	}
 
+
+
+	/**
+	 * @return StdoutLogger
+	 */
+	protected function getLogger(): StdoutLogger
+	{
+		return \Kiri::getLogger();
+	}
+
 }

Abstracts/TraitServer.php

@@ -46,7 +46,7 @@ trait TraitServer
             Kiri::getLogger()->alert('Pid ' . getmypid() . ' get signo ' . $no);
             $this->shutdown();
         } catch (\Throwable $exception) {
-            error($exception);
+			\Kiri::getLogger()->json_log($exception);
         }
     }
 

Handler/OnPipeMessage.php

@@ -30,7 +30,7 @@ class OnPipeMessage extends Server
             }
             call_user_func([$message, 'process'], $server, $src_worker_id);
         } catch (\Throwable $throwable) {
-            Kiri::getLogger()->error(throwable($throwable));
+			\Kiri::getLogger()->json_log($throwable, ['src_worker_id' => $src_worker_id, 'message' => $message]);
         }
     }
 

Handler/OnServerWorker.php

@@ -52,7 +52,6 @@ class OnServerWorker extends Kiri\Server\Abstracts\Server
 	 */
 	public function onWorkerNameAlias(OnBeforeWorkerStart $workerStart): void
 	{
-        set_env('environmental_workerId', $workerStart->workerId);
 		if ($workerStart->workerId < $workerStart->server->setting['worker_num']) {
 			$this->processName($workerStart->server, 'Worker');
 			set_env('environmental', Kiri::WORKER);
@@ -60,6 +59,7 @@ class OnServerWorker extends Kiri\Server\Abstracts\Server
 			$this->processName($workerStart->server, 'Tasker');
 			set_env('environmental', Kiri::TASK);
 		}
+		set_env('environmental_worker_id', $workerStart->workerId);
 	}
 
 
@@ -80,9 +80,10 @@ class OnServerWorker extends Kiri\Server\Abstracts\Server
 			} else {
 				$this->dispatch->dispatch(new OnTaskerStart($server, $workerId));
 			}
-            $this->dispatch->dispatch(new OnAfterWorkerStart($server, $workerId));
 		} catch (Throwable $exception) {
-            Kiri::getLogger()->println(throwable($exception));
+			\Kiri::getLogger()->json_log($exception);
+		} finally {
+			$this->dispatch->dispatch(new OnAfterWorkerStart($server, $workerId));
 		}
 	}
 
@@ -143,8 +144,7 @@ class OnServerWorker extends Kiri\Server\Abstracts\Server
 			$message = sprintf('Worker#%d::%d error stop. signal %d, exit_code %d, msg %s, method: %s, path: %s, query: %s', $worker_id, $worker_pid, $signal, $exit_code, swoole_strerror(swoole_last_error(), $signal),
 							   $context->getMethod(), $context->getUri()->getPath(), $context->getUri()->getQuery());
 		}
-        error($message . PHP_EOL);
-
+		$this->getLogger()->println($message);
 		$this->system_mail($message);
 	}
 
@@ -161,7 +161,7 @@ class OnServerWorker extends Kiri\Server\Abstracts\Server
 				Help::sendEmail($email, 'Service Error', $messageContent);
 			}
 		} catch (Throwable $e) {
-            error($e, ['email']);
+			\Kiri::getLogger()->json_log($e);
 		}
 	}
 

Task/Task.php

@@ -82,6 +82,8 @@ class Task
 
             $response = call_user_func([$handler, 'process'], $task_id, $src_worker_id);
         } catch (\Throwable $throwable) {
+			\Kiri::getLogger()->json_log($throwable, ['task_id' => $task_id, 'src_worker_id' => $src_worker_id, 'data' => $data]);
+
 			$response = throwable($throwable);
         } finally {
             $server->finish($response);