Freifunk-Troisdorf/yanic
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[TASK] remove unreachable logs

Browse Source
This commit is contained in:
Martin Geno 2017-04-27 21:45:44 +02:00
parent c8cc65e4c4
commit 73219323cf
No known key found for this signature in database
GPG Key ID: F0D39A37E925E941
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
database/socket/database.go
View File

@ -70,13 +70,7 @@ func (conn *Connection) PruneNodes(deleteAfter time.Duration) {
func (conn *Connection) Close() {
for _, c := range conn.clients {
err := c.Close()
if err != nil {
log.Println("[socket-database] client was not able to close:", err)
}
}
err := conn.listener.Close()
if err != nil {
log.Println("[socket-database] server was not able to close:", err)
c.Close()
}
conn.listener.Close()
}

16
database/socket/database_test.go
View File

@ -42,25 +42,31 @@ func TestClient(t *testing.T) {
config["enable"] = true
config["type"] = "unix"
config["address"] = "/tmp/yanic-database.socket"
config["address"] = "/tmp/yanic-database2.socket"
conn, err := Connect(config)
assert.NoError(err, "connection should work")
assert.NotNil(conn)
client, err := net.Dial("unix", "/tmp/yanic-database.socket")
client, err := net.Dial("unix", "/tmp/yanic-database2.socket")
assert.NoError(err, "connection should work")
assert.NotNil(client)
time.Sleep(1)
time.Sleep(time.Duration(3) * time.Microsecond)
conn.InsertNode(&runtime.Node{})
conn.InsertGlobals(&runtime.GlobalStats{}, time.Now())
conn.PruneNodes(time.Duration(3))
time.Sleep(time.Duration(3) * time.Microsecond)
// to reach in sendJSON removing of disconnection
err = client.Close()
assert.NoError(err, "disconnect should work")
time.Sleep(1)
time.Sleep(time.Duration(3) * time.Microsecond)
conn.InsertNode(&runtime.Node{})
time.Sleep(time.Duration(3) * time.Microsecond)
// to reach all parts of conn.Close()
client, err = net.Dial("unix", "/tmp/yanic-database2.socket")
time.Sleep(time.Duration(3) * time.Microsecond)
conn.Close()
}

7
database/socket/internal.go
View File

@ -2,7 +2,6 @@ package socket
import (
"encoding/json"
"log"
"net"
)
@ -15,7 +14,6 @@ func (config *Connection) handleSocketConnection(ln net.Listener) {
for {
c, err := ln.Accept()
if err != nil {
log.Println("[socket-database] error during connection of a client", err)
continue
}
config.clients[c.RemoteAddr()] = c
@ -28,10 +26,7 @@ func (conn *Connection) sendJSON(msg EventMessage) {
err := d.Encode(&msg)
if err != nil {
err = c.Close()
if err != nil {
log.Println("[socket-database] connection could not close after error on sending event:", err)
}
c.Close()
delete(conn.clients, i)
}
}