Moved the response header output to be before the error check

Fixes #40
klassen-software-solutions · Jun 2, 2022 · 0280d1c · 0280d1c
1 parent 5971a14
commit 0280d1c
Showing 1 changed file with 26 additions and 22 deletions.
diff --git a/Sources/CrestLib/Operation.swift b/Sources/CrestLib/Operation.swift
@@ -127,6 +127,7 @@ final class ResponseDelegate: HTTPClientResponseDelegate {
     var needNewline = false
 
     func didReceiveHead(task: HTTPClient.Task<Void>, _ head: HTTPResponseHead) -> EventLoopFuture<Void> {
+        outputResponseHeaders(head)
         if head.status != .ok {
             error = OperationError.httpError(head.status)
         } else {
@@ -136,28 +137,6 @@ final class ResponseDelegate: HTTPClientResponseDelegate {
                     prettyPrintIsPossible = true
                 }
             }
-            if Configuration.shared.showResponseHeaders {
-                print("Headers:")
-                print("  \(head.version) \(head.status.code) \(head.status)".uppercased())
-                var maxLen = 0
-                for header in head.headers {
-                    let len = header.name.count
-                    if len > maxLen && len <= 25 {
-                        maxLen = len
-                    }
-                }
-                if maxLen > 25 {
-                    maxLen = 25
-                }
-                for header in head.headers {
-                    var name = header.name + ":"
-                    if name.count < maxLen+1 {
-                        name = name.padding(toLength: maxLen+1, withPad: " ", startingAt: 0)
-                    }
-                    print("  \(name) \(header.value)")
-                }
-                print("Content:")
-            }
         }
         return task.eventLoop.makeSucceededVoidFuture()
     }
@@ -196,6 +175,31 @@ final class ResponseDelegate: HTTPClientResponseDelegate {
             || contentType.starts(with: "text/xml")
             || contentType.starts(with: "application/json")
     }
+
+    func outputResponseHeaders(_ head: HTTPResponseHead) {
+        if Configuration.shared.showResponseHeaders {
+            print("Headers:")
+            print("  \(head.version) \(head.status.code) \(head.status)".uppercased())
+            var maxLen = 0
+            for header in head.headers {
+                let len = header.name.count
+                if len > maxLen && len <= 25 {
+                    maxLen = len
+                }
+            }
+            if maxLen > 25 {
+                maxLen = 25
+            }
+            for header in head.headers {
+                var name = header.name + ":"
+                if name.count < maxLen+1 {
+                    name = name.padding(toLength: maxLen+1, withPad: " ", startingAt: 0)
+                }
+                print("  \(name) \(header.value)")
+            }
+            print("Content:")
+        }
+    }
 }