Merge branch 'master' into dev

2017-10-23 16:41:46 +08:00
parent e9139ee56f aab8b41da9
commit c23d733cfd
1 changed files with 2 additions and 2 deletions
--- a/services/tunnel_bridge.go
+++ b/services/tunnel_bridge.go
@ -147,7 +147,7 @@ func (s *TunnelBridge) Start(args interface{}) (err error) {
 						s.cmClient.Remove(key)
 						break
 					} else {
-						//log.Printf("%s heartbeat from client", key)
+						// log.Printf("heartbeat from client %s", key)
 					}
 				}
 			}()
@ -184,7 +184,7 @@ func (s *TunnelBridge) Start(args interface{}) (err error) {
 						log.Printf("control connection read err: %s", err)
 						break
 					} else {
-						// log.Printf("heartbeat from server ,id:%s", ID)
+						// log.Printf("heartbeat from server ,id:%s", serverID)
 					}
 				}
 				close(readDie)