Add logging

Author: binarymason

.gitignore

@@ -1 +1,2 @@
 dist/pkg
+*.log

dist/init/systemd/bashrpc.service

@@ -5,7 +5,7 @@ Description=bashrpc
 Type=simple
 Restart=always
 RestartSec=5s
-ExecStart=/usr/local/bin/bashrpc -c /etc/bashrpc/bashrpc.yml
+ExecStart=/usr/local/bin/bashrpc -c /etc/bashrpc/bashrpc.yml --log /var/log/bashrpc.log
 
 [Install]
 WantedBy=multi-user.target

dist/init/sysvinit/bashrpc

@@ -21,7 +21,7 @@ test -x $DAEMON || exit 0
 
 start() {
     touch $LOGFILE
-    nohup "$DAEMON" -c "$CONFIGFILE" &
+    nohup "$DAEMON" -c "$CONFIGFILE" --log "$LOGFILE" &
 }
 
 stop() {

logging.go

@@ -0,0 +1,30 @@
+package main
+
+import (
+	"log"
+	"net/http"
+)
+
+type loggingResponseWriter struct {
+	http.ResponseWriter
+	statusCode int
+}
+
+// logRequest is a closure that allows logging of the request as well as the response
+func logRequest(wrappedHandler http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		lrw := loggingResponseWrapper(w)
+		wrappedHandler.ServeHTTP(lrw, req)
+		statusCode := lrw.statusCode
+		log.Println(req.RemoteAddr, req.Method, req.URL, statusCode, http.StatusText(statusCode))
+	})
+}
+
+func loggingResponseWrapper(w http.ResponseWriter) *loggingResponseWriter {
+	return &loggingResponseWriter{w, http.StatusOK}
+}
+
+func (lrw *loggingResponseWriter) WriteHeader(code int) {
+	lrw.statusCode = code
+	lrw.ResponseWriter.WriteHeader(code)
+}

main.go

@@ -3,16 +3,23 @@ package main
 import (
 	"flag"
 	"fmt"
+	"io"
 	"log"
 	"os"
 )
 
-var configPath string
+var (
+	configPath string
+	logPath    string
+)
 
 func init() {
 	c := flag.String("c", "", "specify bashRPC config file")
+	l := flag.String("log", "bashrpc.log", "specify log file")
 	flag.Parse()
+
 	configPath = *c
+	logPath = *l
 }
 
 func main() {
@@ -22,6 +29,15 @@ func main() {
 		os.Exit(1)
 	}
 
+	logFile, err := os.OpenFile(logPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
+
+	if err != nil {
+		panic(err)
+	}
+
+	defer logFile.Close()
+	log.SetOutput(io.MultiWriter(os.Stdout, logFile))
+
 	rtr, err := newRouter(configPath)
 	if err != nil {
 		log.Fatal(fmt.Sprintf("%v", err))

router.go

@@ -3,6 +3,7 @@ package main
 import (
 	"errors"
 	"fmt"
+	"log"
 	"net/http"
 	"strings"
 )
@@ -32,8 +33,9 @@ func (rtr *router) listen() error {
 	initSSL(rtr.config.Cert, rtr.config.Key)
 	http.HandleFunc("/", rtr.handler)
 
-	fmt.Println("listening on port", rtr.config.Port)
-	return http.ListenAndServeTLS(":"+rtr.config.Port, rtr.config.Cert, rtr.config.Key, nil)
+	log.Println("starting bashRPC server...")
+	log.Println("listening on port", rtr.config.Port)
+	return http.ListenAndServeTLS(":"+rtr.config.Port, rtr.config.Cert, rtr.config.Key, logRequest(http.DefaultServeMux))
 }
 
 func (rtr *router) handler(w http.ResponseWriter, r *http.Request) {

ssl.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"log"
 	"os"
 	"path/filepath"
 	"strings"
@@ -74,7 +73,5 @@ func mkdirP(p string) error {
 		return nil
 	}
 
-	log.Println("# creating directory: ", dir)
 	return os.MkdirAll(dir, 0700)
-
 }