Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_46011646
wechaty
提交
1eedca2f
W
wechaty
项目概览
weixin_46011646
/
wechaty
与 Fork 源项目一致
Fork自
wechaty / wechaty
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
W
wechaty
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1eedca2f
编写于
11月 13, 2016
作者:
Huan (李卓桓)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
log for
https://travis-ci.org/wechaty/wechaty/jobs/175396480#L1828
上级
ee3232f7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
8 deletion
+7
-8
src/puppet-web/watchdog.ts
src/puppet-web/watchdog.ts
+6
-7
test/puppet-web/watchdog.spec.ts
test/puppet-web/watchdog.spec.ts
+1
-1
未找到文件。
src/puppet-web/watchdog.ts
浏览文件 @
1eedca2f
...
...
@@ -44,8 +44,7 @@ function onFeed(this: PuppetWeb, food: WatchdogFood) {
throw
new
Error
(
'
onFeed() must has `this` of instanceof PuppetWeb
'
)
}
const
feed
=
`
${
food
.
type
}
:[
${
food
.
data
}
]`
log
.
silly
(
'
PuppetWebWatchdog
'
,
'
onFeed: %d, %s
'
,
food
.
timeout
,
feed
)
log
.
silly
(
'
PuppetWebWatchdog
'
,
'
onFeed: %d, %s[%s]
'
,
food
.
timeout
,
food
.
type
,
food
.
data
)
/**
* Disable Watchdog on the following conditions:
...
...
@@ -58,15 +57,15 @@ function onFeed(this: PuppetWeb, food: WatchdogFood) {
*
* this is because we will not want to active watchdog when we are closing a browser, or browser is closed.
*/
// if (this.state.current() === 'dead' && this.state.inprocess()) {
// log.warn('PuppetWebWatchdog', 'onFeed() is disabled because state.current() is `dead` and inprocess()')
// return
// }
if
(
this
.
state
.
target
()
===
'
dead
'
||
this
.
state
.
inprocess
())
{
log
.
warn
(
'
PuppetWebWatchdog
'
,
'
onFeed() is disabled because target state is `dead` or state is inprocess
'
)
log
.
warn
(
'
PuppetWebWatchdog
'
,
'
onFeed(type=%s, data=%s, timeout=%d) is disabled because state target: %s inprocess: %s
'
,
food
.
type
,
food
.
data
,
food
.
timeout
,
this
.
state
.
target
(),
this
.
state
.
inprocess
()
)
return
}
const
feed
=
`
${
food
.
type
}
:[
${
food
.
data
}
]`
setWatchDogTimer
.
call
(
this
,
food
.
timeout
,
feed
)
this
.
emit
(
'
heartbeat
'
,
feed
)
...
...
test/puppet-web/watchdog.spec.ts
浏览文件 @
1eedca2f
...
...
@@ -27,7 +27,7 @@ test('timer', async t => {
try
{
pw
.
addListener
(
'
error
'
,
failOnUnexpectedErrorEvent
)
Watchdog
.
onFeed
.
call
(
pw
,
{
data
:
'
initing directly
'
})
Watchdog
.
onFeed
.
call
(
pw
,
{
data
:
'
initing directly
from test
'
})
t
.
pass
(
'
should ok with default food type
'
)
const
savedLevel
=
log
.
level
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录