From c80dcd050df62dc6e422b5339e282f69a61ee52d Mon Sep 17 00:00:00 2001
From: fatedier <fatedier@gmail.com>
Date: Wed, 4 Jan 2017 23:09:28 +0800
Subject: [PATCH] update default value of heartbeat_interval and
 heartbeat_timeout

---
 conf/frpc.ini               | 9 ++++-----
 conf/frps.ini               | 6 +++---
 src/models/client/config.go | 4 ++--
 src/models/server/config.go | 2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/conf/frpc.ini b/conf/frpc.ini
index 967ce9a..04dac05 100644
--- a/conf/frpc.ini
+++ b/conf/frpc.ini
@@ -22,11 +22,10 @@ auth_token = 123
 # for privilege mode
 privilege_token = 12345678
 
-# [optional]  heartbeat conf
-# heartbeat_interval default value is 20, heartbeat_timeout default value is 90
-heartbeat_interval = 20
-heartbeat_timeout = 90
-
+# heartbeat configure, it's not recommended to modify the default value
+# the default value of heartbeat_interval is 10 and heartbeat_timeout is 30
+# heartbeat_interval = 10
+# heartbeat_timeout = 30
 
 # ssh is the proxy name same as server's configuration
 [ssh]
diff --git a/conf/frps.ini b/conf/frps.ini
index b91bf02..06b3c6c 100644
--- a/conf/frps.ini
+++ b/conf/frps.ini
@@ -30,9 +30,9 @@ log_max_days = 3
 privilege_mode = true
 privilege_token = 12345678
 
-# [optional]heartbeat conf
-# heartbeat_timeout default value is 90
-heartbeat_timeout = 90
+# heartbeat configure, it's not recommended to modify the default value
+# the default value of heartbeat_timeout is 30
+# heartbeat_timeout = 30
 
 # only allow frpc to bind ports you list, if you set nothing, there won't be any limit
 privilege_allow_ports = 2000-3000,3001,3003,4000-50000
diff --git a/src/models/client/config.go b/src/models/client/config.go
index 2d62ad7..d04657b 100644
--- a/src/models/client/config.go
+++ b/src/models/client/config.go
@@ -33,8 +33,8 @@ var (
 	LogLevel          string = "info"
 	LogMaxDays        int64  = 3
 	PrivilegeToken    string = ""
-	HeartBeatInterval int64  = 20
-	HeartBeatTimeout  int64  = 90
+	HeartBeatInterval int64  = 10
+	HeartBeatTimeout  int64  = 30
 )
 
 var ProxyClients map[string]*ProxyClient = make(map[string]*ProxyClient)
diff --git a/src/models/server/config.go b/src/models/server/config.go
index 8fe799a..e52d96c 100644
--- a/src/models/server/config.go
+++ b/src/models/server/config.go
@@ -51,7 +51,7 @@ var (
 	// if PrivilegeAllowPorts is not nil, tcp proxies which remote port exist in this map can be connected
 	PrivilegeAllowPorts map[int64]struct{}
 	MaxPoolCount        int64 = 100
-	HeartBeatTimeout    int64 = 90
+	HeartBeatTimeout    int64 = 30
 	UserConnTimeout     int64 = 10
 
 	VhostHttpMuxer    *vhost.HttpMuxer