From bba34aa582b4ce9c388f2cdd37f67b641b8d3b34 Mon Sep 17 00:00:00 2001
From: Amir Raminfar <findamir@gmail.com>
Date: Sat, 10 Apr 2021 17:03:34 -0700
Subject: [PATCH] Minor clean up

---
 assets/components/RelativeTime.vue |  5 +++--
 web/logs.go                        | 22 +++++++++++++---------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/assets/components/RelativeTime.vue b/assets/components/RelativeTime.vue
index 044912ef..445fe21c 100644
--- a/assets/components/RelativeTime.vue
+++ b/assets/components/RelativeTime.vue
@@ -3,9 +3,10 @@
 </template>
 
 <script>
-import { mapActions, mapState } from "vuex";
+import { mapState } from "vuex";
 import { formatRelative } from "date-fns";
-import { enGB, enUS } from "date-fns/locale";
+import enGB from "date-fns/locale/en-GB";
+import enUS from "date-fns/locale/en-US";
 
 const use24Hr =
   new Intl.DateTimeFormat(undefined, {
diff --git a/web/logs.go b/web/logs.go
index d37ad259..d0491e42 100644
--- a/web/logs.go
+++ b/web/logs.go
@@ -1,3 +1,4 @@
+
 package web
 
 import (
@@ -99,12 +100,12 @@ func (h *handler) streamLogs(w http.ResponseWriter, r *http.Request) {
 	}
 	defer reader.Close()
 
-	scanner := bufio.NewScanner(reader)
-	const maxCapacity = 1024 * 1024
-	buf := make([]byte, maxCapacity)
-	scanner.Buffer(buf, maxCapacity)
-	for scanner.Scan() {
-		message := scanner.Text()
+
+	buffered := bufio.NewReader(reader)
+	var readerError error
+	var message string
+	for  {
+		message, readerError = buffered.ReadString('\n')
 		fmt.Fprintf(w, "data: %s\n", message)
 		if index := strings.IndexAny(message, " "); index != -1 {
 			id := message[:index]
@@ -114,16 +115,19 @@ func (h *handler) streamLogs(w http.ResponseWriter, r *http.Request) {
 		}
 		fmt.Fprintf(w, "\n")
 		f.Flush()
+		if readerError != nil {
+			break
+		}
 	}
 
 	log.Debugf("streaming stopped: %v", container.ID)
 
-	if scanner.Err() == nil {
+	if readerError == io.EOF {
 		log.Debugf("container stopped: %v", container.ID)
 		fmt.Fprintf(w, "event: container-stopped\ndata: end of stream\n\n")
 		f.Flush()
-	} else if scanner.Err() != context.Canceled {
-		log.Errorf("unknown error while streaming %v", scanner.Err())
+	} else if readerError != context.Canceled {
+		log.Errorf("unknown error while streaming %v", readerError.Error())
 	}
 
 	log.WithField("routines", runtime.NumGoroutine()).Debug("runtime goroutine stats")