Move details to http and add new function to iface

Instead of doing the details check in the printer we now handle
that in the http server and call an interface function on renderer.

Author: aaronvb

cmd/protocol.go

@@ -20,7 +20,25 @@ func init() {
 }
 
 func http(cmd *cobra.Command, args []string) {
-	renderer := &renderer.Printer{Port: Port, Addr: Address, BuildInfo: BuildInfo, Details: Details}
-	httpServer := server.Http{Addr: Address, Port: Port, ResponseCode: ResponseCode, Output: renderer}
+	logOutput := &renderer.Logger{
+		File: LogFile,
+		Port: Port,
+		Addr: Address,
+	}
+	output := &renderer.Printer{
+		Port:      Port,
+		Addr:      Address,
+		BuildInfo: BuildInfo,
+		LogFile:   LogFile,
+		Details:   Details}
+
+	httpServer := server.Http{
+		Addr:         Address,
+		Port:         Port,
+		ResponseCode: ResponseCode,
+		Output:       output,
+		LogOutput:    logOutput,
+		Details:      Details}
+
 	httpServer.Start()
 }

pkg/renderer/printer.go

@@ -83,10 +83,15 @@ func (p *Printer) IncomingRequest(fields logrequest.RequestFields, params string
 	text := p.incomingRequestText(fields, params)
 	pterm.Info.WithPrefix(prefix).Println(text)
 
-	if p.Details {
-		table := p.incomingRequestHeadersTable(headers)
-		pterm.Printf("%s\n\n", table)
-	}
+	p.startSpinner()
+}
+
+// IncomingRequestHeader handles the output for incoming requests headers to the server.
+func (p *Printer) IncomingRequestHeaders(headers map[string][]string) {
+	p.Spinner.Stop()
+
+	table := p.incomingRequestHeadersTable(headers)
+	pterm.Printf("%s\n\n", table)
 
 	p.startSpinner()
 }

pkg/renderer/renderer.go

@@ -18,5 +18,10 @@ type Renderer interface {
 	// Fatal is used when we need to display a message and should always exit the CLI.
 	Fatal(error)
 
-	IncomingRequest(logrequest.RequestFields, string, map[string][]string)
+	// IncomingRequest is called when we receive an incoming request to the server.
+	IncomingRequest(logrequest.RequestFields, string)
+
+	// IncomingRequestHeaders is called when the details flag is passed and we want to
+	// render the headers.
+	IncomingRequestHeaders(map[string][]string)
 }

pkg/server/http.go

@@ -23,6 +23,8 @@ type Http struct {
 
 	// Output is the Renderer interface.
 	Output renderer.Renderer
+	// Determines if header details should be shown with the request
+	Details bool
 }
 
 // Start will start the HTTP server.
@@ -64,5 +66,9 @@ func (s *Http) logRequest(next http.Handler) http.Handler {
 		fields := lr.ToFields()
 		params := logparams.LogParams{Request: r, HidePrefix: true}
 		s.Output.IncomingRequest(fields, params.ToString(), r.Header)
+		if s.Details {
+			s.Output.IncomingRequestHeaders(r.Header)
+			s.LogOutput.IncomingRequestHeaders(r.Header)
+		}
 	})
 }

pkg/server/http_test.go

@@ -21,8 +21,13 @@ func (mp *MockPrinter) Fatal(error)              {}
 func (mp *MockPrinter) Start()                   {}
 func (mp *MockPrinter) ErrorLogger() *log.Logger { return log.New(os.Stderr, "", 0) }
 func (mp *MockPrinter) IncomingRequest(fields logrequest.RequestFields, params string, headers map[string][]string) {
+
+func (mp *MockPrinter) IncomingRequest(fields logrequest.RequestFields, params string) {
 	mp.fields = fields
 	mp.params = params
+}
+
+func (mp *MockPrinter) IncomingRequestHeaders(headers map[string][]string) {
 	mp.headers = headers
 }