feat: #3

cmd/server.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"net"
 	"net/http"
+	"time"
 
 	"github.com/spf13/cobra"
 )
@@ -31,6 +32,27 @@ func init() {
 
 func StartServer() error {
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		ip := GetIP(r)
+		fmt.Fprint(w, ip+"\n")
+
+		// logging
+		user := r.URL.Query().Get("name")
+		if user == "" {
+			user = r.URL.String()
+		}
+		host, _, _ := net.SplitHostPort(r.RemoteAddr)
+		log.Printf("%s %s %s %s %s\n", time.Now().Format("2006-01-02-15:04:05"), host, ip, user, r.Header.Get("User-Agent"))
+	})
+
+	err := http.ListenAndServe(addr+":"+port, simpleLogger(http.DefaultServeMux))
+	if err != nil {
+		log.Println(err)
+		return err
+	}
+	return nil
+}
+
+func GetIP(r *http.Request) string {
 	ip := r.Header.Get("X-Real-Ip")
 	if ip == "" {
 		ip = r.Header.Get("X-Forwarded-For")
@@ -42,16 +64,7 @@ func StartServer() error {
 			ip = r.RemoteAddr
 		}
 	}
-		r.Header.Add("X-Myip", ip)
+	return ip
-		fmt.Fprint(w, ip+"\n")
-	})
-
-	err := http.ListenAndServe(addr+":"+port, simpleLogger(http.DefaultServeMux))
-	if err != nil {
-		log.Println(err)
-		return err
-	}
-	return nil
 }
 
 func simpleLogger(handler http.Handler) http.Handler {
@@ -63,11 +76,7 @@ func simpleLogger(handler http.Handler) http.Handler {
 		// 		fmt.Println(name, value)
 		// 	}
 		// }
-		user := r.URL.Query().Get("name")
+		// log.Printf("%s %s %s %s\n", r.RemoteAddr, r.Method, r.URL, r.Header.Get("User-Agent"))
-		if user == "" {
-			user = r.URL.String()
-		}
-		log.Printf("%s %s %s %s\n", r.RemoteAddr, r.Method, user, r.Header.Get("User-Agent"))
 		handler.ServeHTTP(w, r)
 	})
 }