Separate log lines for multiple HTTP header values

internal/schemes/http/connect.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/isobit/ndog/internal"
 	"github.com/isobit/ndog/internal/log"
+	"github.com/isobit/ndog/internal/util"
 )
 
 type connectOptions struct {
@@ -130,20 +131,14 @@ func Connect(cfg ndog.ConnectConfig) error {
 
 	// Do request
 	log.Logf(0, "request: %s %s", opts.Method, reqUrl.RequestURI())
-	for _, key := range sortedHeaderKeys(httpReq.Header) {
-		values := httpReq.Header[key]
-		log.Logf(1, "request header: %s: %s", key, strings.Join(values, ", "))
-	}
+	util.LogHeaders("request header: ", httpReq.Header)
 	resp, err := client.Do(httpReq)
 	if err != nil {
 		return err
 	}
 
 	log.Logf(0, "response: %s", resp.Status)
-	for _, key := range sortedHeaderKeys(resp.Header) {
-		values := resp.Header[key]
-		log.Logf(1, "response header: %s: %s", key, strings.Join(values, ", "))
-	}
+	util.LogHeaders("response header: ", resp.Header)
 
 	if opts.GraphQL {
 		var bodyJson GraphQLResponse

internal/schemes/http/listen.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/isobit/ndog/internal"
 	"github.com/isobit/ndog/internal/log"
+	"github.com/isobit/ndog/internal/util"
 )
 
 type listenOptions struct {
@@ -96,10 +97,7 @@ func Listen(cfg ndog.ListenConfig) error {
 			if r.Host != cfg.URL.Host {
 				log.Logf(1, "request header: Host: %s", r.Host)
 			}
-			for _, key := range sortedHeaderKeys(r.Header) {
-				values := r.Header[key]
-				log.Logf(1, "request header: %s: %s", key, strings.Join(values, ", "))
-			}
+			util.LogHeaders("request header: ", r.Header)
 			if opts.ServeFile != "" {
 				http.ServeFile(w, r, filepath.Join(opts.ServeFile, r.URL.Path))
 				return

internal/schemes/websocket/websocket.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/isobit/ndog/internal"
 	"github.com/isobit/ndog/internal/log"
+	"github.com/isobit/ndog/internal/util"
 )
 
 var WSScheme = &ndog.Scheme{
@@ -63,9 +64,7 @@ func Listen(cfg ndog.ListenConfig) error {
 			if r.Host != cfg.URL.Host {
 				log.Logf(1, "request header: Host: %s", r.Host)
 			}
-			for key, values := range r.Header {
-				log.Logf(1, "request header: %s: %s", key, strings.Join(values, ", "))
-			}
+			util.LogHeaders("request header: ", r.Header)
 
 			upgrader := &websocket.Upgrader{}
 			conn, err := upgrader.Upgrade(w, r, nil)

internal/util/util.go

@@ -0,0 +1,26 @@
+package util
+
+import (
+	"net/http"
+	"sort"
+
+	"github.com/isobit/ndog/internal/log"
+)
+
+func sortedHeaderKeys(header http.Header) []string {
+	keys := make([]string, 0, len(header))
+	for k := range header {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	return keys
+}
+
+func LogHeaders(prefix string, header http.Header) {
+	for _, key := range sortedHeaderKeys(header) {
+		values := header[key]
+		for _, value := range values {
+			log.Logf(1, "%s%s: %s", prefix, key, value)
+		}
+	}
+}