Merge branch 'master' into dev
This commit is contained in:
@ -147,7 +147,7 @@ func (s *TunnelBridge) Start(args interface{}) (err error) {
|
|||||||
s.cmClient.Remove(key)
|
s.cmClient.Remove(key)
|
||||||
break
|
break
|
||||||
} else {
|
} 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)
|
log.Printf("control connection read err: %s", err)
|
||||||
break
|
break
|
||||||
} else {
|
} else {
|
||||||
// log.Printf("heartbeat from server ,id:%s", ID)
|
// log.Printf("heartbeat from server ,id:%s", serverID)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
close(readDie)
|
close(readDie)
|
||||||
|
|||||||
Reference in New Issue
Block a user