From 54f3f5aae71ade9d74e397648c6f71e4e96a5cb8 Mon Sep 17 00:00:00 2001
From: Buddy Sandidge <git@buddy.wtf>
Date: Tue, 1 Oct 2019 21:04:47 -0700
Subject: [PATCH] Fix build after go module update

---
 logger.go        | 31 ++++++++++++++++---------------
 server.go        |  2 +-
 what-is-my-ip.go |  4 ++--
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/logger.go b/logger.go
index ab9f1c1..3c53dc6 100644
--- a/logger.go
+++ b/logger.go
@@ -7,29 +7,30 @@ import (
 	"time"
 )
 
-// Logger interface
-type Logger interface {
-	Println(v ...interface{})
-	Printf(format string, v ...interface{})
+// Logger type
+type Logger struct {
+	logger *log.Logger
 }
 
-// LoggerHandler interface
-type LoggerHandler interface {
-	Logger
-	ServeHTTP(http.ResponseWriter, *http.Request, http.HandlerFunc)
+// NewLogger returns a logger interface
+func NewLogger() *Logger {
+	return &Logger{
+		logger: log.New(os.Stdout, appLabel, log.Ldate|log.Lmicroseconds),
+	}
 }
 
-// NewLogger returns a logger interface
-func NewLogger() LoggerHandler {
-	return &logger{log.New(os.Stdout, appLabel, log.Ldate|log.Lmicroseconds)}
+// Println is proxy for println
+func (l *Logger) Println(v ...interface{}) {
+	l.logger.Println(v...)
 }
 
-type logger struct {
-	Logger
+// Printf calls Printf on logger
+func (l *Logger) Printf(f string, v ...interface{}) {
+	l.logger.Printf(f, v...)
 }
 
-func (l *logger) ServeHTTP(rw http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
+func (l *Logger) ServeHTTP(rw http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
 	start := time.Now()
 	next(rw, r)
-	l.Printf("Completed %s to %s in %v", r.Method, r.URL.Path, time.Since(start))
+	l.logger.Printf("Completed %s to %s in %v", r.Method, r.URL.Path, time.Since(start))
 }
diff --git a/server.go b/server.go
index ca3689a..d09d104 100644
--- a/server.go
+++ b/server.go
@@ -14,7 +14,7 @@ import (
 // Server that handles http responses
 type Server struct {
 	headerNames []string
-	logger      LoggerHandler
+	logger      *Logger
 	tmpl        *template.Template
 }
 
diff --git a/what-is-my-ip.go b/what-is-my-ip.go
index 8549817..dc59018 100644
--- a/what-is-my-ip.go
+++ b/what-is-my-ip.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/GeertJohan/go.rice"
+	rice "github.com/GeertJohan/go.rice"
 	"github.com/gorilla/pat"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
@@ -85,7 +85,7 @@ func getHandler(headers []string) (http.Handler, *Server, error) {
 	}
 
 	recover := negroni.NewRecovery()
-	recover.Logger = service.logger
+	recover.Logger = service.logger.logger
 
 	router := pat.New()