yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-04-28 22:25:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into link

Browse source 
Fix merge conflicts from flexible logging branch
This commit is contained in:
Neil Alexander 2019-01-27 20:54:21 +00:00
commit 1a3a67f205
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
17 changed files with 98 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/yggdrasil/tcp.go
View file

@ -133,16 +133,16 @@ func (iface *tcpInterface) listen() error {
// Runs the listener, which spawns off goroutines for incoming connections.
func (iface *tcpInterface) listener() {
defer iface.serv.Close()
iface.core.log.Println("Listening for TCP on:", iface.serv.Addr().String())
iface.core.log.Infoln("Listening for TCP on:", iface.serv.Addr().String())
for {
sock, err := iface.serv.Accept()
if err != nil {
iface.core.log.Println("Failed to accept connection:", err)
iface.core.log.Errorln("Failed to accept connection:", err)
return
}
select {
case <-iface.stop:
iface.core.log.Println("Stopping listener")
iface.core.log.Errorln("Stopping listener")
return
default:
if err != nil {
@ -290,7 +290,7 @@ func (iface *tcpInterface) handler(sock net.Conn, incoming bool) {
iface.core.log.Println(err)
panic(err)
}
iface.core.log.Println("DEBUG: starting handler for", name)
iface.core.log.Debugln("DEBUG: starting handler for", name)
err = link.handler()
iface.core.log.Println("DEBUG: stopped handler for", name, err)
iface.core.log.Debugln("DEBUG: stopped handler for", name, err)
}