From 6f90a3e6ced06c8e68c2590dcb87e91548f8b891 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Latour Date: Wed, 9 Apr 2014 12:20:37 -0700 Subject: [PATCH] Log real request method --- CGDWebServer/GCDWebServerConnection.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CGDWebServer/GCDWebServerConnection.m b/CGDWebServer/GCDWebServerConnection.m index 9a08b7e..82f3d1b 100644 --- a/CGDWebServer/GCDWebServerConnection.m +++ b/CGDWebServer/GCDWebServerConnection.m @@ -678,7 +678,7 @@ static NSString* _StringFromAddressData(NSData* data) { } - (GCDWebServerResponse*)processRequest:(GCDWebServerRequest*)request withBlock:(GCDWebServerProcessBlock)block { - LOG_DEBUG(@"Connection on socket %i processing %@ request for \"%@\" (%lu bytes body)", _socket, _request.method, _request.path, (unsigned long)_bytesRead); + LOG_DEBUG(@"Connection on socket %i processing request \"%@ %@\" with %lu bytes body", _socket, _virtualHEAD ? @"HEAD" : _request.method, _request.path, (unsigned long)_bytesRead); GCDWebServerResponse* response = nil; @try { response = block(request); @@ -731,9 +731,10 @@ static inline BOOL _CompareResources(NSString* responseETag, NSString* requestET int result = close(_socket); if (result != 0) { LOG_ERROR(@"Failed closing socket %i for connection (%i): %s", _socket, errno, strerror(errno)); + } else { + LOG_DEBUG(@"Did close connection on socket %i", _socket); } - LOG_DEBUG(@"Did close connection on socket %i", _socket); - LOG_VERBOSE(@"[%@] %@ %i \"%@ %@\" (%lu | %lu)", self.localAddressString, self.remoteAddressString, (int)_statusCode, _request.method, _request.path, (unsigned long)_bytesRead, (unsigned long)_bytesWritten); + LOG_VERBOSE(@"[%@] %@ %i \"%@ %@\" (%lu | %lu)", self.localAddressString, self.remoteAddressString, (int)_statusCode, _virtualHEAD ? @"HEAD" : _request.method, _request.path, (unsigned long)_bytesRead, (unsigned long)_bytesWritten); } @end