frps: fix sometimes no response when frpc login to frps, see fatedier…

…#142
Ltaimao · Dec 26, 2016 · 37470c2 · 37470c2
1 parent 04a4591
commit 37470c2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/assets/statik/statik.go b/src/assets/statik/statik.go
diff --git a/src/cmd/frps/control.go b/src/cmd/frps/control.go
@@ -340,6 +340,7 @@ func doLogin(req *msg.ControlReq, c *conn.Conn) (ret int64, info string) {
 		if err != nil {
 			info = fmt.Sprintf("ProxyName [%s], start proxy error: %v", req.ProxyName, err)
 			log.Warn(info)
+			s.Close()
 			return
 		}
 		log.Info("ProxyName [%s], start proxy success", req.ProxyName)

diff --git a/src/models/server/config.go b/src/models/server/config.go
@@ -395,7 +395,7 @@ func CreateProxy(s *ProxyServer) error {
 		if oldServer.Status == consts.Working {
 			return fmt.Errorf("this proxy is already working now")
 		}
-		oldServer.Close()
+		oldServer.Release()
 		if oldServer.PrivilegeMode {
 			delete(ProxyServers, s.Name)
 		}

diff --git a/src/models/server/server.go b/src/models/server/server.go
@@ -270,6 +270,17 @@ func (p *ProxyServer) Start(c *conn.Conn) (err error) {
 }
 
 func (p *ProxyServer) Close() {
+	p.Release()
+
+	// if the proxy created by PrivilegeMode, delete it when closed
+	if p.PrivilegeMode {
+		// NOTE: this will take the global ProxyServerMap's lock
+		// if we only want to release resources, use Release() instead
+		DeleteProxy(p.Name)
+	}
+}
+
+func (p *ProxyServer) Release() {
 	p.Lock()
 	defer p.Unlock()
 
@@ -296,10 +307,6 @@ func (p *ProxyServer) Close() {
 		}
 	}
 	metric.SetStatus(p.Name, p.Status)
-	// if the proxy created by PrivilegeMode, delete it when closed
-	if p.PrivilegeMode {
-		DeleteProxy(p.Name)
-	}
 }
 
 func (p *ProxyServer) WaitUserConn() (closeFlag bool) {