RPCs? Yes please!

CupOfTea696 · Apr 19, 2015 · e0da0d5 · e0da0d5
1 parent 029aaf6
commit e0da0d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/Server/Dispatcher.php b/src/Server/Dispatcher.php
@@ -53,8 +53,8 @@ public function onCall(Connection $connection, $id, $topic, array $params) {
         $response = $this->handle($connection, $request);
 
         if($response->getStatusCode() == 404){
-            $msg = config('twostream.rpc.enabled') ? config('twostream.rpc.error.enabled') : config('twostream.rpc.error.disabled');
-            echo var_dump([config('twostream.rpc.enabled'), config('twostream.rpc.error.enabled'), config('twostream.rpc.error.disabled')]);
+            $msg = config('twostream.response.rpc.enabled') ?
+                config('twostream.response.rpc.error.enabled') : config('twostream.response.rpc.error.disabled');
             $connection->callError($id, 'wamp.error.no_such_procedure', $msg);
         }else{
             $content = (array)json_decode($response->getContent(), true);
@@ -199,11 +199,12 @@ protected function buildRequest($verb, $connection, $topic, $data = [], $params
             'protocol'  => 'ws://',
             'host'      => $connection->WebSocket->request->getHost(),
             'port'      => ':' . config('twostream.websocket.port'),
-            'path'      => '/' . trim($topic->getId(), '/') . (isset($params) ? implode('/', $params) : ''),
+            'path'      => '/' . trim($topic->getId(), '/') . (isset($params) ? '/' . implode('/', $params) : ''),
         ];
         $cookies = $connection->WebSocket->request->getCookies();
         array_forget($cookies, config('session.cookie')); // Make sure the normal Session Facade does not contain the client's Session.
 
+        echo var_dump(implode($uri));
 
         return Request::createFromBase(
             SymfonyRequest::create(

diff --git a/src/TwoStreamServiceProvider.php b/src/TwoStreamServiceProvider.php
@@ -92,8 +92,6 @@ public function register(){
         $this->mergeConfigFrom(
             __DIR__.'/../config/twostream.php', 'twostream'
         );
-        $t = require __DIR__.'/../config/twostream.php';
-        echo var_dump(['wtf', $t]);
 
         $this->app->bindShared('CupOfTea\TwoStream\Contracts\Factory', function($app){
             $config = $this->app['config']['twostream'];