瀏覽代碼

Updated for CocoaLumberJack 2.0

Pierre-Olivier Latour 10 年之前
父節點
當前提交
594497d234
共有 2 個文件被更改,包括 5 次插入5 次删除
  1. 2 2
      GCDWebServer/Core/GCDWebServer.m
  2. 3 3
      GCDWebServer/Core/GCDWebServerPrivate.h

+ 2 - 2
GCDWebServer/Core/GCDWebServer.m

@@ -74,9 +74,9 @@ GCDWebServerLoggingLevel GCDWebServerLogLevel = kGCDWebServerLoggingLevel_Info;
 #endif
 #endif
 #elif defined(__GCDWEBSERVER_LOGGING_FACILITY_COCOALUMBERJACK__)
 #elif defined(__GCDWEBSERVER_LOGGING_FACILITY_COCOALUMBERJACK__)
 #if DEBUG
 #if DEBUG
-int GCDWebServerLogLevel = LOG_LEVEL_DEBUG;
+DDLogLevel GCDWebServerLogLevel = DDLogLevelDebug;
 #else
 #else
-int GCDWebServerLogLevel = LOG_LEVEL_INFO;
+DDLogLevel GCDWebServerLogLevel = DDLogLevelInfo;
 #endif
 #endif
 #endif
 #endif
 
 

+ 3 - 3
GCDWebServer/Core/GCDWebServerPrivate.h

@@ -87,15 +87,15 @@
  *  it as a logging facility.
  *  it as a logging facility.
  */
  */
 
 
-#elif defined(__has_include) && __has_include("DDLogMacros.h")
+#elif defined(__has_include) && __has_include("CocoaLumberjack/CocoaLumberjack.h")
 
 
-#import "DDLogMacros.h"
+#import <CocoaLumberjack/CocoaLumberjack.h>
 
 
 #define __GCDWEBSERVER_LOGGING_FACILITY_COCOALUMBERJACK__
 #define __GCDWEBSERVER_LOGGING_FACILITY_COCOALUMBERJACK__
 
 
 #undef LOG_LEVEL_DEF
 #undef LOG_LEVEL_DEF
 #define LOG_LEVEL_DEF GCDWebServerLogLevel
 #define LOG_LEVEL_DEF GCDWebServerLogLevel
-extern int GCDWebServerLogLevel;
+extern DDLogLevel GCDWebServerLogLevel;
 
 
 #define GWS_LOG_DEBUG(...) DDLogDebug(__VA_ARGS__)
 #define GWS_LOG_DEBUG(...) DDLogDebug(__VA_ARGS__)
 #define GWS_LOG_VERBOSE(...) DDLogVerbose(__VA_ARGS__)
 #define GWS_LOG_VERBOSE(...) DDLogVerbose(__VA_ARGS__)