update: http router update, some modify

Author: inhere

src/Bootstrap/Listener/MasterStartListener.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 2018/3/19
+ * Time: 上午11:32
+ */
+
+namespace Swoft\Http\Server\Bootstrap\Listener;
+
+use Swoft\App;
+use Swoft\Bean\Annotation\ServerListener;
+use Swoft\Bootstrap\Listeners\Interfaces\StartInterface;
+use Swoft\Bootstrap\SwooleEvent;
+use Swoole\Server;
+
+/**
+ * Class MasterStartListener
+ * @package Swoft\Http\Server\Bootstrap\Listener
+ * @ServerListener(event=SwooleEvent::ON_START)
+ */
+class MasterStartListener implements StartInterface
+{
+    public function onStart(Server $server)
+    {
+        \output()->writeln(
+            'Server has been started. ' .
+            "(master PID: <cyan>{$server->master_pid}</cyan>, manager PID: <cyan>{$server->manager_pid}</cyan>)"
+        );
+
+        // output a message before start
+        if (!App::$server->isDaemonize()) {
+            \output()->writeln('You can use <info>CTRL + C</info> to stop run.');
+        }
+    }
+}

src/Command/ServerCommand.php

@@ -60,10 +60,10 @@ public function start()
 
         // 信息面板
         $lines = [
-            '                         Information Panel                     ',
+            '                         Server Information                      ',
             '********************************************************************',
-            "* HTTP | host: <note>$httpHost</note>, port: <note>$httpPort</note>, mode: <note>$httpMode</note>, type: <note>$httpType</note>, Worker: <note>$workerNum</note>",
-            "* TCP  | host: <note>$tcpHost</note>, port: <note>$tcpPort</note>, type: <note>$tcpType</note>, Worker: <note>$workerNum</note> ($tcpEnable)",
+            "* HTTP | host: <note>$httpHost</note>, port: <note>$httpPort</note>, type: <note>$httpType</note>, worker: <note>$workerNum</note>, mode: <note>$httpMode</note>",
+            "* TCP  | host: <note>$tcpHost</note>, port: <note>$tcpPort</note>, type: <note>$tcpType</note>, worker: <note>$workerNum</note> ($tcpEnable)",
             '********************************************************************',
         ];
 

src/Event/Listeners/ApplicationLoaderListener.php

@@ -9,7 +9,7 @@
 use Swoft\Http\Server\Bean\Collector\ControllerCollector;
 
 /**
- * the listener of applicatioin loader
+ * the listener of application loader
  *
  * @Listener(AppEvent::APPLICATION_LOADER)
  * @uses      ApplicationLoaderListener
@@ -22,6 +22,8 @@ class ApplicationLoaderListener implements EventHandlerInterface
 {
     /**
      * @param \Swoft\Event\EventInterface $event
+     * @throws \LogicException
+     * @throws \InvalidArgumentException
      */
     public function handle(EventInterface $event)
     {
@@ -31,5 +33,4 @@ public function handle(EventInterface $event)
         $requestMapping = ControllerCollector::getCollector();
         $httpRouter->registerRoutes($requestMapping);
     }
-
-}
+}

src/Http/HttpServer.php

@@ -72,21 +72,6 @@ protected function registerRpcEvent()
         $this->registerSwooleEvents($this->listen, $swooleRpcPortEvents);
     }
 
-    public function onStart(\Swoole\Server $server)
-    {
-        parent::onStart($server);
-
-        \output()->writeln(
-            'Server has been started. ' .
-            "(master PID: <info>{$server->master_pid}</info>, manager PID: <info>{$server->manager_pid}</info>)"
-        );
-
-        // output a message before start
-        if (!$this->isDaemonize()) {
-            \output()->writeln("Press <info>Ctrl-C</info> to quit.\n");
-        }
-    }
-
     /**
      * onRequest event callback
      * Each request will create an coroutine