Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
企猫商务
frp
提交
54545757
F
frp
项目概览
企猫商务
/
frp
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
frp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
54545757
编写于
2月 07, 2021
作者:
W
wuqing
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
client: reconnect more quickly if it's a dial error
上级
976fd81d
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
20 addition
and
14 deletion
+20
-14
client/service.go
client/service.go
+11
-3
pkg/config/visitor.go
pkg/config/visitor.go
+0
-2
pkg/config/visitor_test.go
pkg/config/visitor_test.go
+1
-1
tests/ci/cmd_test.go
tests/ci/cmd_test.go
+3
-3
tests/ci/health/health_test.go
tests/ci/health/health_test.go
+1
-1
tests/ci/normal_test.go
tests/ci/normal_test.go
+1
-1
tests/ci/reconnect_test.go
tests/ci/reconnect_test.go
+1
-1
tests/ci/reload_test.go
tests/ci/reload_test.go
+1
-1
tests/ci/template_test.go
tests/ci/template_test.go
+1
-1
未找到文件。
client/service.go
浏览文件 @
54545757
...
...
@@ -17,6 +17,7 @@ package client
import
(
"context"
"crypto/tls"
"errors"
"fmt"
"io/ioutil"
"net"
...
...
@@ -177,9 +178,16 @@ func (svr *Service) keepControllerWorking() {
if
err
!=
nil
{
xl
.
Warn
(
"reconnect to server error: %v"
,
err
)
time
.
Sleep
(
delayTime
)
delayTime
=
delayTime
*
2
if
delayTime
>
maxDelayTime
{
delayTime
=
maxDelayTime
opErr
:=
&
net
.
OpError
{}
// quick retry for dial error
if
errors
.
As
(
err
,
&
opErr
)
&&
opErr
.
Op
==
"dial"
{
delayTime
=
2
*
time
.
Second
}
else
{
delayTime
=
delayTime
*
2
if
delayTime
>
maxDelayTime
{
delayTime
=
maxDelayTime
}
}
continue
}
...
...
pkg/config/visitor.go
浏览文件 @
54545757
...
...
@@ -23,7 +23,6 @@ import (
"gopkg.in/ini.v1"
)
// Visitor
var
(
visitorConfTypeMap
=
map
[
string
]
reflect
.
Type
{
...
...
@@ -64,7 +63,6 @@ type XTCPVisitorConf struct {
BaseVisitorConf
`ini:",extends" json:"inline"`
}
// DefaultVisitorConf creates a empty VisitorConf object by visitorType.
// If visitorType doesn't exist, return nil.
func
DefaultVisitorConf
(
visitorType
string
)
VisitorConf
{
...
...
pkg/config/visitor_test.go
浏览文件 @
54545757
...
...
@@ -19,8 +19,8 @@ import (
"github.com/fatedier/frp/pkg/consts"
"gopkg.in/ini.v1"
"github.com/stretchr/testify/assert"
"gopkg.in/ini.v1"
)
const
testVisitorPrefix
=
"test."
...
...
tests/ci/cmd_test.go
浏览文件 @
54545757
...
...
@@ -19,7 +19,7 @@ func TestCmdTCP(t *testing.T) {
if
assert
.
NoError
(
err
)
{
defer
s
.
Stop
()
}
time
.
Sleep
(
2
00
*
time
.
Millisecond
)
time
.
Sleep
(
5
00
*
time
.
Millisecond
)
c
:=
util
.
NewProcess
(
consts
.
FRPC_BIN_PATH
,
[]
string
{
"tcp"
,
"-s"
,
"127.0.0.1:20000"
,
"-t"
,
"123"
,
"-u"
,
"test"
,
"-l"
,
"10701"
,
"-r"
,
"20801"
,
"-n"
,
"tcp_test"
})
...
...
@@ -43,7 +43,7 @@ func TestCmdUDP(t *testing.T) {
if
assert
.
NoError
(
err
)
{
defer
s
.
Stop
()
}
time
.
Sleep
(
2
00
*
time
.
Millisecond
)
time
.
Sleep
(
5
00
*
time
.
Millisecond
)
c
:=
util
.
NewProcess
(
consts
.
FRPC_BIN_PATH
,
[]
string
{
"udp"
,
"-s"
,
"127.0.0.1:20000"
,
"-t"
,
"123"
,
"-u"
,
"test"
,
"-l"
,
"10702"
,
"-r"
,
"20802"
,
"-n"
,
"udp_test"
})
...
...
@@ -67,7 +67,7 @@ func TestCmdHTTP(t *testing.T) {
if
assert
.
NoError
(
err
)
{
defer
s
.
Stop
()
}
time
.
Sleep
(
2
00
*
time
.
Millisecond
)
time
.
Sleep
(
5
00
*
time
.
Millisecond
)
c
:=
util
.
NewProcess
(
consts
.
FRPC_BIN_PATH
,
[]
string
{
"http"
,
"-s"
,
"127.0.0.1:20000"
,
"-t"
,
"123"
,
"-u"
,
"test"
,
"-n"
,
"udp_test"
,
"-l"
,
"10704"
,
"--custom_domain"
,
"127.0.0.1"
})
...
...
tests/ci/health/health_test.go
浏览文件 @
54545757
...
...
@@ -175,7 +175,7 @@ func TestHealthCheck(t *testing.T) {
defer
frpsProcess
.
Stop
()
}
time
.
Sleep
(
1
00
*
time
.
Millisecond
)
time
.
Sleep
(
5
00
*
time
.
Millisecond
)
frpcProcess
:=
util
.
NewProcess
(
consts
.
FRPC_SUB_BIN_PATH
,
[]
string
{
"-c"
,
frpcCfgPath
})
err
=
frpcProcess
.
Start
()
...
...
tests/ci/normal_test.go
浏览文件 @
54545757
...
...
@@ -42,7 +42,7 @@ func TestMain(m *testing.M) {
panic
(
err
)
}
time
.
Sleep
(
2
00
*
time
.
Millisecond
)
time
.
Sleep
(
5
00
*
time
.
Millisecond
)
p2
:=
util
.
NewProcess
(
consts
.
FRPC_BIN_PATH
,
[]
string
{
"-c"
,
"./auto_test_frpc.ini"
})
if
err
=
p2
.
Start
();
err
!=
nil
{
panic
(
err
)
...
...
tests/ci/reconnect_test.go
浏览文件 @
54545757
...
...
@@ -56,7 +56,7 @@ func TestReconnect(t *testing.T) {
defer
frpsProcess
.
Stop
()
}
time
.
Sleep
(
2
00
*
time
.
Millisecond
)
time
.
Sleep
(
5
00
*
time
.
Millisecond
)
frpcProcess
:=
util
.
NewProcess
(
consts
.
FRPC_BIN_PATH
,
[]
string
{
"-c"
,
frpcCfgPath
})
err
=
frpcProcess
.
Start
()
...
...
tests/ci/reload_test.go
浏览文件 @
54545757
...
...
@@ -94,7 +94,7 @@ func TestReload(t *testing.T) {
defer
frpsProcess
.
Stop
()
}
time
.
Sleep
(
2
00
*
time
.
Millisecond
)
time
.
Sleep
(
5
00
*
time
.
Millisecond
)
frpcProcess
:=
util
.
NewProcess
(
consts
.
FRPC_BIN_PATH
,
[]
string
{
"-c"
,
frpcCfgPath
})
err
=
frpcProcess
.
Start
()
...
...
tests/ci/template_test.go
浏览文件 @
54545757
...
...
@@ -55,7 +55,7 @@ func TestConfTemplate(t *testing.T) {
defer
frpsProcess
.
Stop
()
}
time
.
Sleep
(
2
00
*
time
.
Millisecond
)
time
.
Sleep
(
5
00
*
time
.
Millisecond
)
frpcProcess
:=
util
.
NewProcess
(
"env"
,
[]
string
{
"FRP_TOKEN=123456"
,
"TCP_REMOTE_PORT=20801"
,
consts
.
FRPC_BIN_PATH
,
"-c"
,
frpcCfgPath
})
err
=
frpcProcess
.
Start
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录