diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b2715d9..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.swp -httptail diff --git a/main.go b/main.go index cae5da7..fccacf5 100644 --- a/main.go +++ b/main.go @@ -27,13 +27,14 @@ 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, MustExist: true}) - watch = true - if (err == nil) { - fmt.Println(err) - } + t, err := tail.TailFile(fn, tail.Config{Follow: false}) + watch = true + } + + if (err == nil) { + fmt.Println(err) } var m = "" @@ -51,10 +52,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(getMsTimestamp(), 16), "Filename": fn, "Text": m, "error": err}) + json.NewEncoder(w).Encode(map[string]string{"time": strconv.FormatInt(t_ms(), 16), "Filename": fn, "Text": m, "error": err}) } -func getMsTimestamp() (int64) { +func t_ms() (int64) { now := time.Now() ns := now.UnixNano() ms := ns / 1000000 @@ -87,6 +88,7 @@ var m_prev = "" func main() { uid := os.Getuid() + t.Filename = "" if (uid == -1) { fmt.Println("Windows is unsupported") @@ -99,7 +101,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() }