Remove support for CocoaLumberJack
Fix #328
diff --git a/GCDWebServer.podspec b/GCDWebServer.podspec
index 6969304..e5991e4 100644
--- a/GCDWebServer.podspec
+++ b/GCDWebServer.podspec
@@ -33,11 +33,6 @@
cs.osx.framework = 'SystemConfiguration'
end
- s.subspec "CocoaLumberjack" do |cs|
- cs.dependency 'GCDWebServer/Core'
- cs.dependency 'CocoaLumberjack', '~> 3'
- end
-
s.subspec 'WebDAV' do |cs|
cs.subspec "Core" do |ccs|
ccs.dependency 'GCDWebServer/Core'
@@ -48,11 +43,6 @@
ccs.osx.library = 'xml2'
ccs.compiler_flags = '-I$(SDKROOT)/usr/include/libxml2'
end
-
- cs.subspec "CocoaLumberjack" do |cscl|
- cscl.dependency 'GCDWebServer/WebDAV/Core'
- cscl.dependency 'GCDWebServer/CocoaLumberjack'
- end
end
s.subspec 'WebUploader' do |cs|
@@ -62,10 +52,5 @@
ccs.requires_arc = true
ccs.resource = "GCDWebUploader/GCDWebUploader.bundle"
end
-
- cs.subspec "CocoaLumberjack" do |cscl|
- cscl.dependency 'GCDWebServer/WebUploader/Core'
- cscl.dependency 'GCDWebServer/CocoaLumberjack'
- end
end
end
diff --git a/GCDWebServer/Core/GCDWebServer.h b/GCDWebServer/Core/GCDWebServer.h
index beec7b8..59572ba 100644
--- a/GCDWebServer/Core/GCDWebServer.h
+++ b/GCDWebServer/Core/GCDWebServer.h
@@ -532,11 +532,10 @@
*
* Currently supported third-party logging facilities are:
* - XLFacility (by the same author as GCDWebServer): https://github.com/swisspol/XLFacility
- * - CocoaLumberjack: https://github.com/CocoaLumberjack/CocoaLumberjack
*
- * For both the built-in logging facility and CocoaLumberjack, the default
- * logging level is INFO (or DEBUG if the preprocessor constant "DEBUG"
- * evaluates to non-zero at compile time).
+ * For the built-in logging facility, the default logging level is INFO
+ * (or DEBUG if the preprocessor constant "DEBUG" evaluates to non-zero at
+ * compile time).
*
* It's possible to have GCDWebServer use a custom logging facility by defining
* the "__GCDWEBSERVER_LOGGING_HEADER__" preprocessor constant in Xcode build
diff --git a/GCDWebServer/Core/GCDWebServer.m b/GCDWebServer/Core/GCDWebServer.m
index 837c083..e52ccd4 100644
--- a/GCDWebServer/Core/GCDWebServer.m
+++ b/GCDWebServer/Core/GCDWebServer.m
@@ -77,12 +77,6 @@
#else
GCDWebServerLoggingLevel GCDWebServerLogLevel = kGCDWebServerLoggingLevel_Info;
#endif
-#elif defined(__GCDWEBSERVER_LOGGING_FACILITY_COCOALUMBERJACK__)
-#if DEBUG
-DDLogLevel GCDWebServerLogLevel = DDLogLevelDebug;
-#else
-DDLogLevel GCDWebServerLogLevel = DDLogLevelInfo;
-#endif
#endif
#if !TARGET_OS_IPHONE
@@ -1092,8 +1086,6 @@
+ (void)setLogLevel:(int)level {
#if defined(__GCDWEBSERVER_LOGGING_FACILITY_XLFACILITY__)
[XLSharedFacility setMinLogLevel:level];
-#elif defined(__GCDWEBSERVER_LOGGING_FACILITY_COCOALUMBERJACK__)
- GCDWebServerLogLevel = level;
#elif defined(__GCDWEBSERVER_LOGGING_FACILITY_BUILTIN__)
GCDWebServerLogLevel = level;
#endif
diff --git a/GCDWebServer/Core/GCDWebServerPrivate.h b/GCDWebServer/Core/GCDWebServerPrivate.h
index c6a0fac..326ec52 100644
--- a/GCDWebServer/Core/GCDWebServerPrivate.h
+++ b/GCDWebServer/Core/GCDWebServerPrivate.h
@@ -84,27 +84,6 @@
#define GWS_DNOT_REACHED() XLOG_DEBUG_UNREACHABLE()
/**
- * Automatically detect if CocoaLumberJack is available and if so use
- * it as a logging facility.
- */
-
-#elif defined(__has_include) && __has_include("CocoaLumberjack/CocoaLumberjack.h")
-
-#import <CocoaLumberjack/CocoaLumberjack.h>
-
-#define __GCDWEBSERVER_LOGGING_FACILITY_COCOALUMBERJACK__
-
-#undef LOG_LEVEL_DEF
-#define LOG_LEVEL_DEF GCDWebServerLogLevel
-extern DDLogLevel GCDWebServerLogLevel;
-
-#define GWS_LOG_DEBUG(...) DDLogDebug(__VA_ARGS__)
-#define GWS_LOG_VERBOSE(...) DDLogVerbose(__VA_ARGS__)
-#define GWS_LOG_INFO(...) DDLogInfo(__VA_ARGS__)
-#define GWS_LOG_WARNING(...) DDLogWarn(__VA_ARGS__)
-#define GWS_LOG_ERROR(...) DDLogError(__VA_ARGS__)
-
-/**
* If all of the above fail, then use GCDWebServer built-in
* logging facility.
*/
