From 1ea76f4ab1689883e41e5313a30fde38e76a9db7 Mon Sep 17 00:00:00 2001 From: Tai Groot Date: Fri, 9 Apr 2021 09:47:49 -0700 Subject: [PATCH] breaks browser out into package --- browser/main.go | 199 +++++++++++++++++++++++++++++++++++++++++++++++ main.go | 200 +----------------------------------------------- 2 files changed, 202 insertions(+), 197 deletions(-) create mode 100644 browser/main.go diff --git a/browser/main.go b/browser/main.go new file mode 100644 index 0000000..8550c6f --- /dev/null +++ b/browser/main.go @@ -0,0 +1,199 @@ +package browser + +import ( + "html/template" + "net/http" +) + +func LogSocketViewHandler(w http.ResponseWriter, r *http.Request) { + homeTemplate.Execute(w, "ws://"+r.Host+"/logs") +} + +var homeTemplate = template.Must(template.New("").Parse(` + + + + + + +
+ + + + + + + + + + +
TimeStampLevelOutputSource
+ +
+ + + + + + + + + + +
+
+
+ + +
+ + + +`)) diff --git a/main.go b/main.go index d147747..0544f37 100644 --- a/main.go +++ b/main.go @@ -2,21 +2,16 @@ package main import ( "flag" - "html/template" - "log" "net/http" "time" + "github.com/taigrr/log-socket/browser" "github.com/taigrr/log-socket/logger" "github.com/taigrr/log-socket/ws" ) var addr = flag.String("addr", "0.0.0.0:8080", "http service address") -func home(w http.ResponseWriter, r *http.Request) { - homeTemplate.Execute(w, "ws://"+r.Host+"/logs") -} - func generateLogs() { for { logger.Info("This is an info log!") @@ -32,196 +27,7 @@ func main() { defer logger.Flush() flag.Parse() http.HandleFunc("/logs", ws.LogSocketHandler) - http.HandleFunc("/", home) + http.HandleFunc("/", browser.LogSocketViewHandler) go generateLogs() - log.Fatal(http.ListenAndServe(*addr, nil)) + logger.Fatal(http.ListenAndServe(*addr, nil)) } - -var homeTemplate = template.Must(template.New("").Parse(` - - - - - - -
- - - - - - - - - - -
TimeStampLevelOutputSource
- -
- - - - - - - - - - -
-
-
- - -
- - - -`))