From 58d925ecbc3b2f246e8c1e77e05b03962aed824b Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 23 Apr 2017 17:28:28 +0200
Subject: no warning on expected error on client disconnect

---
 src/hub/src/spreadspace.org/sfive/s5srvPipe.go | 9 +++++++--
 src/hub/src/spreadspace.org/sfive/s5store.go   | 6 ++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/hub/src/spreadspace.org/sfive/s5srvPipe.go b/src/hub/src/spreadspace.org/sfive/s5srvPipe.go
index 8084461..efc190c 100644
--- a/src/hub/src/spreadspace.org/sfive/s5srvPipe.go
+++ b/src/hub/src/spreadspace.org/sfive/s5srvPipe.go
@@ -2,6 +2,7 @@ package sfive
 
 import (
 	"bufio"
+	"io"
 	"net"
 )
 
@@ -9,7 +10,9 @@ func (self StatsSinkServer) handleConnection(conn net.Conn) {
 	reader := bufio.NewReader(conn)
 	buffer, err := reader.ReadBytes('\n')
 	if err != nil {
-		s5l.Printf("pipe: failed to read from connection: %v\n", err)
+		if err != io.EOF {
+			s5l.Printf("pipe: failed to read from connection: %v\n", err)
+		}
 		return
 	}
 	marshaller, err := NewStatefulDecoder(buffer)
@@ -21,7 +24,9 @@ func (self StatsSinkServer) handleConnection(conn net.Conn) {
 	for {
 		buffer, err := reader.ReadBytes('\n')
 		if err != nil {
-			s5l.Printf("pipe: failed to read from connection: %v\n", err)
+			if err != io.EOF {
+				s5l.Printf("pipe: failed to read from connection: %v\n", err)
+			}
 			return
 		}
 
diff --git a/src/hub/src/spreadspace.org/sfive/s5store.go b/src/hub/src/spreadspace.org/sfive/s5store.go
index cd95076..bbfce00 100644
--- a/src/hub/src/spreadspace.org/sfive/s5store.go
+++ b/src/hub/src/spreadspace.org/sfive/s5store.go
@@ -285,6 +285,9 @@ func itob(v int) []byte {
 }
 
 func (s sqliteStore) insertDataUpdateClientEntries(cd []ClientData, du dataUpdateDb) error {
+	if len(cd) == 0 {
+		return nil
+	}
 	return s.dbBolt.Update(func(tx *bolt.Tx) error {
 		b := tx.Bucket([]byte(clientDataBn))
 		jsonData, err := json.Marshal(cd)
@@ -401,6 +404,9 @@ func (s sqliteStore) GetClientsByUpdateId(id int) (res []ClientData, err error)
 		b := tx.Bucket([]byte(clientDataBn))
 
 		jsonData := b.Get(itob(id))
+		if jsonData == nil {
+			return nil
+		}
 		return json.Unmarshal(jsonData, &res)
 	})
 	return
-- 
cgit v1.2.3