Merge branch 'nifi' of github.com:D4-project/analyzer-d4-log into nifi

logcompiler/sshd.go

@@ -96,19 +96,17 @@ func (s *SSHDCompiler) Flush() error {
 func (s *SSHDCompiler) Pull(c chan error) {
 	r1 := *s.r1
 
+	for {
 	jsoner := json.NewDecoder(s.reader)
-
 	DecodeLoop:
 		for jsoner.More() {
 			var m GrokedSSHD
 			err := jsoner.Decode(&m)
 			if err := jsoner.Decode(&m); err == io.EOF {
-			// In case of EOF, we wait for the reader to have
-			// new data available
-			time.Sleep(s.retryPeriod)
-			continue DecodeLoop
+				// On EOF we break this loop to go to a sleep 
+				break DecodeLoop
 			} else if err != nil {
-			log.Fatal(err)
+				s.teardown(err)
 			}
 
 			fmt.Printf("time: %s, hostname: %s, client_ip: %s, user: %s\n", m.SyslogTimestamp, m.SyslogHostname, m.SshdClientIP, m.SshdInvalidUser)
@@ -146,6 +144,11 @@ DecodeLoop:
 				}
 			}
 		}
+
+		// EOF, we wait for the reader to have
+		// new data available
+		time.Sleep(s.retryPeriod)
+	}
 }
 
 func compileStats(s *SSHDCompiler, parsedTime time.Time, src string, username string, host string) error {