Merge pull request #239 from swooletw/develop

Develop
swooletw · Mar 7, 2019 · 43c9266 · 43c9266
2 parents abd9c7a + fa965b7
commit 43c9266
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/copy_versioned_files.php b/copy_versioned_files.php
@@ -2,12 +2,18 @@
 
 require __DIR__.'/vendor/autoload.php';
 
-use SwooleTW\Http\Coroutine\Connectors\ConnectorFactory;
 use SwooleTW\Http\Helpers\FW;
 use SwooleTW\Http\Task\QueueFactory;
+use SwooleTW\Http\Coroutine\Connectors\ConnectorFactory;
+
+try {
+    $framework = ucfirst(FW::current());
+    $version = FW::version();
+} catch (Throwable $e) {
+    echo "No files were generated.\n";
+    die;
+}
 
-$version = FW::version();
-$framework = ucfirst(FW::current());
 $color = "\033[0;32m";
 $noColor = "\033[0m";
 $stubs = [];

diff --git a/src/HttpServiceProvider.php b/src/HttpServiceProvider.php
@@ -89,7 +89,7 @@ public function boot()
         $config = $this->app->make('config');
 
         if ($config->get('swoole_http.websocket.enabled')) {
-            $this->bootRoutes();
+            $this->bootWebsocketRoutes();
         }
 
         if ($config->get('swoole_http.server.access_log')) {