111

2021-09-19 16:42:29 +08:00
parent d77f5b16c3
commit ff58d0faef
16 changed files with 256 additions and 262 deletions
@@ -14,111 +14,29 @@ use Psr\EventDispatcher\EventDispatcherInterface;
 use ReflectionException;
 use Server\ServerManager;

-class OnWorkerStart implements EventDispatcherInterface
+class OnWorkerStart extends WorkerStart implements EventDispatcherInterface
 {


-	/**
-	 * @var Annotation
-	 */
-	#[Inject(Annotation::class)]
-	public Annotation $annotation;
+    /**
+     * @param object $event
+     * @return void
+     * @throws ConfigException
+     * @throws ReflectionException
+     * @throws Exception
+     */
+    public function dispatch(object $event)
+    {
+        $isWorker = $event->workerId < $event->server->setting['worker_num'];

+        $time = microtime(true);

-	/**
-	 * @var Router
-	 */
-	#[Inject(Router::class)]
-	public Router $router;
-
-
-	/**
-	 * @param object $event
-	 * @return void
-	 * @throws ConfigException
-	 * @throws ReflectionException
-	 * @throws Exception
-	 */
-	public function dispatch(object $event)
-	{
-		$isWorker = $event->workerId < $event->server->setting['worker_num'];
-
-		$time = microtime(true);
-
-		$this->interpretDirectory($isWorker);
-		if ($isWorker) {
-			ServerManager::setEnv('environmental', Kiri::WORKER);
-			Kiri::getDi()->get(Router::class)->_loader();
-
-			$this->setProcessName(sprintf('Worker[%d].%d', $event->server->worker_pid, $event->workerId));
-		} else {
-			ServerManager::setEnv('environmental', Kiri::TASK);
-
-			$this->setProcessName(sprintf('Tasker[%d].%d', $event->server->worker_pid, $event->workerId));
-		}
-		$this->mixed($event, Config::get('id', 'system-service'), $isWorker, $time);
-	}
-
-
-	/**
-	 * @param $event
-	 * @param $name
-	 * @param $isWorker
-	 * @param $time
-	 */
-	private function mixed($event, $name, $isWorker, $time)
-	{
-		echo sprintf("\033[36m[" . date('Y-m-d H:i:s') . "]\033[0m [%s]Builder %s[%d].%d use time %s.", $name, $isWorker ? 'Worker' : 'Taker',
-				$event->server->worker_pid, $event->workerId, round(microtime(true) - $time, 6) . 's') . PHP_EOL;
-	}
-
-
-	/**
-	 * @param $prefix
-	 * @throws ConfigException
-	 */
-	protected function setProcessName($prefix)
-	{
-		if (Kiri::getPlatform()->isMac()) {
-			return;
-		}
-		$name = Config::get('id', 'system-service');
-		if (!empty($prefix)) {
-			$name .= '.' . $prefix;
-		}
-		swoole_set_process_name($name);
-	}
-
-
-	/**
-	 * @throws ReflectionException
-	 * @throws Exception
-	 */
-	private function interpretDirectory($isWorker)
-	{
-		$di = Kiri::getDi();
-
-//		$namespace = array_filter(explode('\\', Router::getNamespace()));
-//
-//		$namespace = APP_PATH . implode('/', $namespace);
-
-		$this->annotation->read(APP_PATH . 'app', 'App');
-
-		$fileLists = $this->annotation->read(APP_PATH . 'app');
-		foreach ($fileLists->runtime(APP_PATH . 'app') as $class) {
-			foreach (NoteManager::getTargetNote($class) as $value) {
-				$value->execute($class);
-			}
-			$methods = $di->getMethodAttribute($class);
-			foreach ($methods as $method => $attribute) {
-				if (empty($attribute)) {
-					continue;
-				}
-				foreach ($attribute as $item) {
-					$item->execute($class, $method);
-				}
-			}
-		}
-	}
+        ServerManager::setEnv('environmental', Kiri::WORKER);
+        if (!is_enable_file_modification_listening()) {
+            $this->router->read_files();
+            $this->interpretDirectory();
+        }
+        $this->mixed($event, $isWorker, $time);
+    }

 }