From 5e95a3f499d93f8dce239536bb1853395dbad838 Mon Sep 17 00:00:00 2001
From: mStar aka a person <12024604-mstarongitlab@users.noreply.gitlab.com>
Date: Tue, 23 Jan 2024 14:58:37 +0100
Subject: [PATCH] Add license and logging

---
 Dockerfile |  1 +
 LICENSE    | 21 +++++++++++++++++++++
 go.mod     |  9 ++++++++-
 go.sum     | 17 +++++++++++++++++
 main.go    | 17 ++++++++++++-----
 5 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 LICENSE
 create mode 100644 go.sum

diff --git a/Dockerfile b/Dockerfile
index 08db692..e743288 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,7 @@ FROM golang:1.21 AS build-stage
 WORKDIR /app
 
 COPY go.mod ./
+COPY go.sum ./
 RUN go mod download
 
 COPY *.go ./
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d103aec
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 mStar
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 911727d..710f53a 100644
--- a/go.mod
+++ b/go.mod
@@ -1,3 +1,10 @@
 module gitlab.com/evilthings-services/mstar
 
-go 1.20
+go 1.21.5
+
+require (
+	github.com/sirupsen/logrus v1.9.3
+	gitlab.com/mstarongitlab/weblogger v0.0.0-20240123135616-d64461e3b20d
+)
+
+require golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..a709093
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,17 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+gitlab.com/mstarongitlab/weblogger v0.0.0-20240123135616-d64461e3b20d h1:ixTYuViFIDQh9fs3xyc8sPKBr7dU7T98rs4kqM0q51k=
+gitlab.com/mstarongitlab/weblogger v0.0.0-20240123135616-d64461e3b20d/go.mod h1:8G+BrXVs97wI7W+Z4E8M2MXFFKKy01cVnFazoCpNg9Y=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/main.go b/main.go
index 2523a8e..fbd57de 100644
--- a/main.go
+++ b/main.go
@@ -4,9 +4,11 @@ import (
 	"embed"
 	"fmt"
 	"html/template"
-	"log"
 	"net/http"
 	"os"
+
+	"github.com/sirupsen/logrus"
+	"gitlab.com/mstarongitlab/weblogger"
 )
 
 const HTML_PREFIX = "<!-- "
@@ -31,8 +33,8 @@ func main() {
 	port := os.Getenv("PORT")
 	if port == "" {
 		port = "8080"
-		log.Printf("Defaulting to port %s \n", port)
 	}
+	logrus.WithField("port", port).Info("starting server")
 
 	// Custom-ish paths. Includes templates
 	http.HandleFunc("/", handleRoot)
@@ -49,12 +51,17 @@ func main() {
 	// Static files not in /static or /.well-known
 	http.HandleFunc("/robots.txt", buildHTTPFileReader(embed_robots_txt))
 	http.HandleFunc("/humans.txt", buildHTTPFileReader(embed_humans_txt))
-	if err := http.ListenAndServe(":"+port, nil); err != nil {
-		log.Fatal(err)
+
+	default_mux := http.DefaultServeMux
+	logger := weblogger.LoggingMiddleware(default_mux)
+
+	if err := http.ListenAndServe(":"+port, logger); err != nil {
+		logrus.WithField("event", "stop server").Fatal(err)
 	}
 }
 
 func handleRoot(w http.ResponseWriter, r *http.Request) {
+	// logRequestInfo(r)
 	tmpl, err := template.ParseFS(embed_templates, "templates/index.html")
 	if err != nil {
 		http.Error(w, "Couldn't parse template file", http.StatusInternalServerError)
@@ -68,6 +75,7 @@ func handleRoot(w http.ResponseWriter, r *http.Request) {
 
 func buildHTTPFileReader(embed_content string) func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
+		// logRequestInfo(r)
 		fmt.Fprintf(w, "%s", embed_content)
 	}
 }
@@ -102,5 +110,4 @@ func genStub(length int, w http.ResponseWriter) {
 		fmt.Fprint(w, '\u0020')
 	}
 	fmt.Fprint(w, HTML_SUFFIX)
-
 }