Bug fix for issue robbiehanson#223 - Logging is hardcoded to off, so enabling it requires forking the repo

robbiehanson · robbiehanson · commit 991e969c466a · 2014-04-11T17:57:17.000-07:00
diff --git a/GCD/GCDAsyncSocket.h b/GCD/GCDAsyncSocket.h
@@ -77,6 +77,9 @@ extern NSString *const GCDAsyncSocketSSLDiffieHellmanParameters;
 #endif
 #endif
 
+#define GCDAsyncSocketLoggingContext 65535
+
+
 enum GCDAsyncSocketError
 {
 	GCDAsyncSocketNoError = 0,           // Never used
diff --git a/GCD/GCDAsyncSocket.m b/GCD/GCDAsyncSocket.m
@@ -33,7 +33,11 @@
 #endif
 
 
-#if 0
+#ifndef GCDAsyncSocketLoggingEnabled
+#define GCDAsyncSocketLoggingEnabled 0
+#endif
+
+#if GCDAsyncSocketLoggingEnabled
 
 // Logging Enabled - See log level below
 
@@ -44,7 +48,7 @@
 #import "DDLog.h"
 
 #define LogAsync   YES
-#define LogContext 65535
+#define LogContext GCDAsyncSocketLoggingContext
 
 #define LogObjc(flg, frmt, ...) LOG_OBJC_MAYBE(LogAsync, logLevel, flg, LogContext, frmt, ##__VA_ARGS__)
 #define LogC(flg, frmt, ...)    LOG_C_MAYBE(LogAsync, logLevel, flg, LogContext, frmt, ##__VA_ARGS__)
@@ -62,8 +66,12 @@
 #define LogTrace()              LogObjc(LOG_FLAG_VERBOSE, @"%@: %@", THIS_FILE, THIS_METHOD)
 #define LogCTrace()             LogC(LOG_FLAG_VERBOSE, @"%@: %s", THIS_FILE, __FUNCTION__)
 
+#ifndef GCDAsyncSocketLogLevel
+#define GCDAsyncSocketLogLevel LOG_LEVEL_VERBOSE
+#endif
+
 // Log levels : off, error, warn, info, verbose
-static const int logLevel = LOG_LEVEL_VERBOSE;
+static const int logLevel = GCDAsyncSocketLogLevel;
 
 #else
 

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,9 @@ extern NSString *const GCDAsyncSocketSSLDiffieHellmanParameters;`
`77`	`77`	`#endif`
`78`	`78`	`#endif`
`79`	`79`
	`80`	`+#define GCDAsyncSocketLoggingContext 65535`
	`81`	`+`
	`82`	`+`
`80`	`83`	`enum GCDAsyncSocketError`
`81`	`84`	`{`
`82`	`85`	`GCDAsyncSocketNoError = 0, // Never used`