Make changes based on PR comments

This commit is contained in:
Duncan Cunningham
2018-07-13 16:17:23 +02:00
parent 9f345c6858
commit 11254331d1
2 changed files with 5 additions and 4 deletions

View File

@@ -71,9 +71,10 @@ typedef void (^GCDWebServerAsyncProcessBlock)(__kindof GCDWebServerRequest* requ
/**
* The GCDWebServerBuiltInLoggerBlock is used to override the built-in logger at runtime.
* The message parameter is the formatted log message with the logging level.
* The block will be passed the log level and the log message, see setLogLevel for
* documentation of the log levels for the built-in logger.
*/
typedef void (^GCDWebServerBuiltInLoggerBlock)(NSString* _Nonnull message);
typedef void (^GCDWebServerBuiltInLoggerBlock)(int level, NSString* _Nonnull message);
/**
* The port used by the GCDWebServer (NSNumber / NSUInteger).

View File

@@ -99,7 +99,7 @@ void GCDWebServerLogMessage(GCDWebServerLoggingLevel level, NSString* format, ..
NSString* message = [[NSString alloc] initWithFormat:format arguments:arguments];
va_end(arguments);
if (_builtInLoggerBlock) {
_builtInLoggerBlock([NSString stringWithFormat:@"[%s] %s", levelNames[level], [message UTF8String]]);
_builtInLoggerBlock(level, message);
} else {
fprintf(stderr, "[%s] %s\n", levelNames[level], [message UTF8String]);
}
@@ -1101,7 +1101,7 @@ static inline NSString* _EncodeBase64(NSString* string) {
#if defined(__GCDWEBSERVER_LOGGING_FACILITY_BUILTIN__)
_builtInLoggerBlock = block;
#else
GWS_DCHECK(false) // Built-in logger must be enabled in order to override
GWS_DNOT_REACHED(); // Built-in logger must be enabled in order to override
#endif
}