Remove support for CocoaLumberJack

swisspol · swisspol · commit 47ed2cc593ec · 2017-08-21T11:37:21.000+02:00
Fix swisspol#328
diff --git a/GCDWebServer.podspec b/GCDWebServer.podspec
@@ -33,11 +33,6 @@ Pod::Spec.new do |s|
     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 @@ Pod::Spec.new do |s|
       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 @@ Pod::Spec.new do |s|
       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
@@ -532,11 +532,10 @@ extern NSString* const GCDWebServerAuthenticationMethod_DigestAccess;
  *
  *  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
@@ -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 @@ @implementation GCDWebServer (Logging)
 + (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
@@ -83,27 +83,6 @@ NS_ASSUME_NONNULL_BEGIN
 #define GWS_DCHECK(__CONDITION__) XLOG_DEBUG_CHECK(__CONDITION__)
 #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.

Original file line number	Diff line number	Diff line change
`@@ -532,11 +532,10 @@ extern NSString* const GCDWebServerAuthenticationMethod_DigestAccess;`
`532`	`532`	`*`
`533`	`533`	`* Currently supported third-party logging facilities are:`
`534`	`534`	`* - XLFacility (by the same author as GCDWebServer): https://github.com/swisspol/XLFacility`
`535`		`- * - CocoaLumberjack: https://github.com/CocoaLumberjack/CocoaLumberjack`
`536`	`535`	`*`
`537`		`- * For both the built-in logging facility and CocoaLumberjack, the default`
`538`		`- * logging level is INFO (or DEBUG if the preprocessor constant "DEBUG"`
`539`		`- * evaluates to non-zero at compile time).`
	`536`	`+ * For the built-in logging facility, the default logging level is INFO`
	`537`	`+ * (or DEBUG if the preprocessor constant "DEBUG" evaluates to non-zero at`
	`538`	`+ * compile time).`
`540`	`539`	`*`
`541`	`540`	`* It's possible to have GCDWebServer use a custom logging facility by defining`
`542`	`541`	`* the "__GCDWEBSERVER_LOGGING_HEADER__" preprocessor constant in Xcode build`