From 8efa577e418a6169ee0e316fbc4c57f178736324 Mon Sep 17 00:00:00 2001 From: Nikita Tokarchuk Date: Mon, 20 Jan 2020 10:33:24 +0100 Subject: [PATCH] fix key scan err handling --- task3-backend/lib/server.go | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/task3-backend/lib/server.go b/task3-backend/lib/server.go index 7634271..833c3d5 100644 --- a/task3-backend/lib/server.go +++ b/task3-backend/lib/server.go @@ -165,19 +165,17 @@ func (s *Server) readKey(conn net.Conn) (key string, err error) { scanner.Buffer(buf, 0) - for { - err = scanner.Err() - if err != nil { - return - } - - if !scanner.Scan() { - continue - } + ok := scanner.Scan() + err = scanner.Err() - key = scanner.Text() - break + if err != nil { + log.Debugf("cannot scan, %v", err) } + if !ok { + return + } + + key = scanner.Text() return }