Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenDocCN
one
提交
bc9bae5a
O
one
项目概览
OpenDocCN
/
one
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
one
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
bc9bae5a
编写于
6月 13, 2019
作者:
lzc828
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
隐藏数据库错误信息
上级
16915555
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
10 deletion
+23
-10
src/Swoole/Event/HttpEvent.php
src/Swoole/Event/HttpEvent.php
+9
-4
src/Swoole/Event/TcpEvent.php
src/Swoole/Event/TcpEvent.php
+8
-4
src/Swoole/Event/WsEvent.php
src/Swoole/Event/WsEvent.php
+6
-2
未找到文件。
src/Swoole/Event/HttpEvent.php
浏览文件 @
bc9bae5a
...
...
@@ -8,6 +8,7 @@
namespace
One\Swoole\Event
;
use
One\Database\Mysql\DbException
;
use
One\Exceptions\Handler
;
use
One\Exceptions\HttpException
;
use
One\Facades\Log
;
...
...
@@ -28,20 +29,24 @@ trait HttpEvent
*/
protected
function
httpRouter
(
\
swoole_http_request
$request
,
\
swoole_http_response
$response
)
{
$req
=
new
\
One\Swoole\Request
(
$request
);
$req
=
new
\
One\Swoole\Request
(
$request
);
$go_id
=
Log
::
setTraceId
(
$req
->
id
());
$res
=
new
\
One\Swoole\Response
(
$req
,
$response
);
$res
=
new
\
One\Swoole\Response
(
$req
,
$response
);
try
{
$router
=
new
Router
();
$server
=
$this
instanceof
Server
?
$this
:
$this
->
server
;
list
(
$req
->
class
,
$req
->
method
,
$mids
,
$action
,
$req
->
args
)
=
$router
->
explain
(
$req
->
method
(),
$req
->
uri
(),
$req
,
$res
,
$server
);
$f
=
$router
->
getExecAction
(
$mids
,
$action
,
$res
,
$server
);
$f
=
$router
->
getExecAction
(
$mids
,
$action
,
$res
,
$server
);
$data
=
$f
();
}
catch
(
\
One\Exceptions\HttpException
$e
)
{
$data
=
Handler
::
render
(
$e
);
}
catch
(
\
Throwable
$e
)
{
error_report
(
$e
);
$data
=
Handler
::
render
(
new
HttpException
(
$res
,
$e
->
getMessage
(),
$e
->
getCode
()));
$msg
=
$e
->
getMessage
();
if
(
$e
instanceof
DbException
)
{
$msg
=
'db error!'
;
}
$data
=
Handler
::
render
(
new
HttpException
(
$res
,
$msg
,
$e
->
getCode
()));
}
Log
::
flushTraceId
(
$go_id
);
$response
->
exist
=
$this
->
server
->
exist
(
$request
->
fd
);
...
...
src/Swoole/Event/TcpEvent.php
浏览文件 @
bc9bae5a
...
...
@@ -8,6 +8,7 @@
namespace
One\Swoole\Event
;
use
One\Database\Mysql\DbException
;
use
One\Facades\Log
;
use
One\Http\Router
;
use
One\Http\RouterException
;
...
...
@@ -30,7 +31,7 @@ trait TcpEvent
$this
->
onReceive
(
$server
,
$fd
,
$reactor_id
,
$data
);
}
public
function
onReceive
(
\
swoole_server
$server
,
$fd
,
$reactor_id
,
$data
)
{
...
...
@@ -58,18 +59,21 @@ trait TcpEvent
protected
function
tcpRouter
(
\
swoole_server
$server
,
$fd
,
$reactor_id
,
$data
)
{
$data
->
uuid
=
uuid
();
$data
->
fd
=
$fd
;
$go_id
=
Log
::
setTraceId
(
$data
->
uuid
);
$data
->
fd
=
$fd
;
$go_id
=
Log
::
setTraceId
(
$data
->
uuid
);
try
{
$router
=
new
Router
();
$server
=
$this
instanceof
Server
?
$this
:
$this
->
server
;
list
(
$data
->
class
,
$data
->
method
,
$mids
,
$action
,
$data
->
args
)
=
$router
->
explain
(
'tcp'
,
$data
->
url
,
$data
,
$server
);
$f
=
$router
->
getExecAction
(
$mids
,
$action
,
$data
,
$server
);
$f
=
$router
->
getExecAction
(
$mids
,
$action
,
$data
,
$server
);
$res
=
$f
();
}
catch
(
RouterException
$e
)
{
$res
=
$e
->
getMessage
();
}
catch
(
\
Throwable
$e
)
{
$res
=
$e
->
getMessage
();
if
(
$e
instanceof
DbException
)
{
$res
=
'db error!'
;
}
error_report
(
$e
);
}
Log
::
flushTraceId
(
$go_id
);
...
...
src/Swoole/Event/WsEvent.php
浏览文件 @
bc9bae5a
...
...
@@ -8,6 +8,7 @@
namespace
One\Swoole\Event
;
use
One\Database\Mysql\DbException
;
use
One\Facades\Log
;
use
One\Http\Router
;
use
One\Http\RouterException
;
...
...
@@ -77,10 +78,10 @@ trait WsEvent
}
$frame
->
data
=
$info
[
'd'
];
$frame
->
uuid
=
uuid
();
$go_id
=
Log
::
setTraceId
(
$frame
->
uuid
);
$go_id
=
Log
::
setTraceId
(
$frame
->
uuid
);
try
{
$router
=
new
Router
();
$server
=
$this
instanceof
Server
?
$this
:
$this
->
server
;
$server
=
$this
instanceof
Server
?
$this
:
$this
->
server
;
$session
=
isset
(
$this
->
session
[
$frame
->
fd
])
?
$this
->
session
[
$frame
->
fd
]
:
null
;
list
(
$frame
->
class
,
$frame
->
method
,
$mids
,
$action
,
$frame
->
args
)
=
$router
->
explain
(
'ws'
,
$info
[
'u'
],
$frame
,
$server
,
$session
);
$f
=
$router
->
getExecAction
(
$mids
,
$action
,
$frame
,
$server
,
$session
);
...
...
@@ -89,6 +90,9 @@ trait WsEvent
$data
=
$e
->
getMessage
();
}
catch
(
\
Throwable
$e
)
{
$data
=
$e
->
getMessage
();
if
(
$e
instanceof
DbException
)
{
$data
=
'db error!'
;
}
error_report
(
$e
);
}
Log
::
flushTraceId
(
$go_id
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录