From aeb198e3c1705a832272171bd21e033cb7179213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Busse?= <bj.rn@baerlin.eu>
Date: Mon, 2 Oct 2017 13:51:31 +0000
Subject: [PATCH] Rename timestamp function

---
 main.go | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/main.go b/main.go
index fccacf5..cae5da7 100644
--- a/main.go
+++ b/main.go
@@ -27,14 +27,13 @@ func fileHandler(w http.ResponseWriter, r *http.Request, s string) {
        sendFile(w, fn, "", "No such file or directory")
        return
     }
-
+    fmt.Println("watch: %#v", watch)
     if (watch == false) {
-        t, err := tail.TailFile(fn, tail.Config{Follow: false})
-    watch = true
-    }
-
-    if (err == nil) {
-       fmt.Println(err)
+        t, err := tail.TailFile(fn, tail.Config{Follow: false, MustExist: true})
+        watch = true
+        if (err == nil) {
+            fmt.Println(err)
+        }
     }
 
     var m = ""
@@ -52,10 +51,10 @@ func fileHandler(w http.ResponseWriter, r *http.Request, s string) {
 }
 
 func sendFile(w http.ResponseWriter, fn string, m string, err string) {
-    json.NewEncoder(w).Encode(map[string]string{"time": strconv.FormatInt(t_ms(), 16), "Filename": fn, "Text": m, "error": err})
+    json.NewEncoder(w).Encode(map[string]string{"time": strconv.FormatInt(getMsTimestamp(), 16), "Filename": fn, "Text": m, "error": err})
 }
 
-func t_ms() (int64) {
+func getMsTimestamp() (int64) {
     now := time.Now()
     ns := now.UnixNano()
     ms := ns / 1000000
@@ -88,7 +87,6 @@ var m_prev = ""
 
 func main() {
     uid := os.Getuid()
-    t.Filename = ""
 
     if (uid == -1) {
         fmt.Println("Windows is unsupported")
@@ -101,7 +99,7 @@ func main() {
 
     http.HandleFunc("/tail/", makeHandler(fileHandler))
 
-        fmt.Println("Serving " + prj + " " + version + " on " + server_inet6)
-        http.ListenAndServe(server_inet6, nil)
-    t.Cleanup()
+    fmt.Println("Serving " + prj + " " + version + " on " + server_inet6)
+    http.ListenAndServe(server_inet6, nil)
+    //t.Cleanup()
 }