Merge pull request #665 from swoftcloud/master

Added rpc error handler

.gitignore

@@ -10,5 +10,6 @@ temp/
 *.lock
 .phpintel/
 .env
+.phpstorm.meta.php
 .DS_Store
 public/devtool/

app/Exception/ApiException.php

@@ -1,21 +1,10 @@
 <?php
-/**
- * +----------------------------------------------------------------------
- * | 自定义异常
- * +----------------------------------------------------------------------
- * | Copyright (c) 2019 http://www.sunnyos.com All rights reserved.
- * +----------------------------------------------------------------------
- * | Date：2019-05-22 15:58:14
- * | Author: Sunny (admin@mail.sunnyos.com) QQ：327388905
- * +----------------------------------------------------------------------
- */
-
 namespace App\Exception;
 
 /**
  * Class ApiException
  *
- * @sunny 2.0
+ * @since 2.0
  */
 class ApiException extends \Exception
 {

app/Exception/Handler/ApiExceptionHandler.php

@@ -12,7 +12,7 @@
 /**
  * Class ApiExceptionHandler
  *
- * @sunny 2.0
+ * @since 2.0
  *
  * @ExceptionHandler(ApiException::class)
  */

app/Exception/Handler/RpcExceptionHandler.php

@@ -0,0 +1,51 @@
+<?php declare(strict_types=1);
+
+
+namespace App\Exception\Handler;
+
+use ReflectionException;
+use Swoft\Bean\Exception\ContainerException;
+use Swoft\Error\Annotation\Mapping\ExceptionHandler;
+use Swoft\Log\Debug;
+use Swoft\Rpc\Error;
+use Swoft\Rpc\Server\Exception\Handler\RpcErrorHandler;
+use Swoft\Rpc\Server\Response;
+use Throwable;
+
+
+/**
+ * Class RpcExceptionHandler
+ *
+ * @since 2.0
+ *
+ * @ExceptionHandler(\Throwable::class)
+ */
+class RpcExceptionHandler extends RpcErrorHandler
+{
+
+    /**
+     * @param Throwable $e
+     * @param Response  $response
+     *
+     * @return Response
+     * @throws ReflectionException
+     * @throws ContainerException
+     */
+    public function handle(Throwable $e, Response $response): Response
+    {
+        // Debug is false
+        if (!APP_DEBUG) {
+            $message = sprintf(' %s At %s line %d', $e->getMessage(), $e->getFile(), $e->getLine());
+            $error   = Error::new($e->getCode(), $message, null);
+        } else {
+            $error = Error::new($e->getCode(), $e->getMessage(), null);
+        }
+
+        Debug::log('Rpc server error(%s)', $e->getMessage());
+
+        $response->setError($error);
+
+        // Debug is true
+        return $response;
+    }
+}

app/Http/Controller/ExceptionController.php

@@ -1,15 +1,4 @@
 <?php
-/**
- * +----------------------------------------------------------------------
- * | 异常demo
- * +----------------------------------------------------------------------
- * | Copyright (c) 2019 http://www.sunnyos.com All rights reserved.
- * +----------------------------------------------------------------------
- * | Date：2019-05-22 16:01:33
- * | Author: Sunny (admin@mail.sunnyos.com) QQ：327388905
- * +----------------------------------------------------------------------
- */
-
 namespace App\Http\Controller;
 
 use App\Exception\ApiException;
@@ -23,6 +12,8 @@ class ExceptionController
 {
     /**
      * @RequestMapping(route="api")
+     *
+     * @throws ApiException
      */
     public function api(){
         throw new ApiException("api of ExceptionController");

app/Http/Controller/RpcController.php

@@ -4,7 +4,7 @@
 namespace App\Http\Controller;
 
 use App\Rpc\Lib\UserInterface;
-use Swoft\Bean\Annotation\Mapping\Bean;
+use Exception;
 use Swoft\Http\Server\Annotation\Mapping\Controller;
 use Swoft\Http\Server\Annotation\Mapping\RequestMapping;
 use Swoft\Rpc\Client\Annotation\Mapping\Reference;
@@ -68,8 +68,22 @@ public function returnBool(): array
      */
     public function bigString(): array
     {
-        $string = $this->userService->getBigContent();
+        $this->userService->getBigContent();
 
         return ['string'];
     }
+
+    /**
+     * @RequestMapping()
+     *
+     * @return array
+     *
+     * @throws Exception
+     */
+    public function exception(): array
+    {
+        $this->userService->exception();
+
+        return ['exception'];
+    }
 }

app/Rpc/Lib/UserInterface.php

@@ -30,4 +30,9 @@ public function delete(int $id): bool;
      * @return string
      */
     public function getBigContent(): string;
+
+    /**
+     * Exception
+     */
+    public function exception(): void;
 }

app/Rpc/Service/UserService.php

@@ -5,6 +5,7 @@
 
 
 use App\Rpc\Lib\UserInterface;
+use Exception;
 use Swoft\Co;
 use Swoft\Rpc\Server\Annotation\Mapping\Service;
 
@@ -47,4 +48,13 @@ public function getBigContent(): string
         $content = Co::readFile(__DIR__ . '/big.data');
         return $content;
     }
+
+    /**
+     * Exception
+     * @throws Exception
+     */
+    public function exception(): void
+    {
+        throw new Exception('exception version');
+    }
 }

app/Rpc/Service/UserServiceV2.php

@@ -5,6 +5,7 @@
 
 
 use App\Rpc\Lib\UserInterface;
+use Exception;
 use Swoft\Co;
 use Swoft\Rpc\Server\Annotation\Mapping\Service;
 
@@ -50,4 +51,13 @@ public function getBigContent(): string
         $content = Co::readFile(__DIR__ . '/big.data');
         return $content;
     }
+
+    /**
+     * Exception
+     * @throws Exception
+     */
+    public function exception(): void
+    {
+        throw new Exception('exception version2');
+    }
 }

app/bean.php

@@ -36,7 +36,7 @@
     ],
     'db'         => [
         'class'    => Database::class,
-        'dsn'      => 'mysql:dbname=test;host=127.0.0.1',
+        'dsn'      => 'mysql:dbname=test;host=172.17.0.3',
         'username' => 'root',
         'password' => 'swoft123456',
     ],