From 2241302856f48277a29eb04f70de7808f59693b5 Mon Sep 17 00:00:00 2001
From: Solderpunk <solderpunk@sdf.org>
Date: Wed, 1 Jul 2020 23:44:59 +0200
Subject: [PATCH] Order log columns more sensibly and drop port from remote
 addresses.

---
 logging.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/logging.go b/logging.go
index 5991690..3247fdc 100644
--- a/logging.go
+++ b/logging.go
@@ -4,6 +4,7 @@ import (
 	"net"
 	"os"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -17,8 +18,11 @@ type LogEntry struct {
 func writeLogEntry(fp *os.File, entry LogEntry) {
 	var line string
 	line = entry.Time.Format(time.RFC3339)
+	// Trim port from remote address
+	addr := entry.RemoteAddr.String()
+	addr = addr[0:strings.LastIndex(addr, ":")]
+	line += "\t" + addr
 	line += "\t" + strconv.Itoa(entry.Status)
-	line += "\t" + entry.RemoteAddr.String()
 	line += "\t" + entry.RequestURL
 	line += "\n"
 	fp.WriteString(line)