MQTT-Client-Framework 0.6.7

> Release date 2016-02-10 [FIX] Logs and CocoaLumberjack dependency closes #107
novastone-media · Feb 10, 2016 · 0339526 · 0339526
1 parent b87b68d
commit 0339526
Show file tree

Hide file tree

Showing 23 changed files with 138 additions and 221 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 MQTT-Client-Framework iOS/OSX/tvOS Release Notes
 ================================================
 
+## MQTT-Client-Framework 0.6.7
+> Release date 2016-02-10
+
+[FIX] Logs and CocoaLumberjack dependency closes #107
+
 ## MQTT-Client-Framework 0.6.6
 > Release date 2016-02-05
 

diff --git a/MQTTClient.podspec b/MQTTClient.podspec
@@ -1,13 +1,13 @@
 Pod::Spec.new do |mqttc|
 	mqttc.name         = "MQTTClient"
-	mqttc.version      = "0.6.6"
+	mqttc.version      = "0.6.7"
 	mqttc.summary      = "iOS, OSX and tvOS native ObjectiveC MQTT Client Framework"
 	mqttc.homepage     = "https://github.com/ckrey/MQTT-Client-Framework"
 	mqttc.license      = { :type => "EPLv1", :file => "LICENSE" }
 	mqttc.author       = { "Christoph Krey" => "krey.christoph@gmail.com" }
 	mqttc.source       = {
 		:git => "https://github.com/ckrey/MQTT-Client-Framework.git",
-		:tag => "0.6.6",
+		:tag => "0.6.7",
 		:submodules => true
 	}
 

diff --git a/MQTTClient/MQTTClient.xcodeproj/project.pbxproj b/MQTTClient/MQTTClient.xcodeproj/project.pbxproj
@@ -178,6 +178,10 @@
 		84A5921B1C3C64A9008C5199 /* MQTTSSLSecurityPolicyTransport.m in Sources */ = {isa = PBXBuildFile; fileRef = 841D0A801C35876E006A82DC /* MQTTSSLSecurityPolicyTransport.m */; };
 		84A5921C1C3C64A9008C5199 /* MQTTCoreDataPersistence.m in Sources */ = {isa = PBXBuildFile; fileRef = 841D0A8A1C358785006A82DC /* MQTTCoreDataPersistence.m */; };
 		84A5921D1C3C64A9008C5199 /* MQTTInMemoryPersistence.m in Sources */ = {isa = PBXBuildFile; fileRef = 841D0A8E1C358793006A82DC /* MQTTInMemoryPersistence.m */; };
+		84AA232E1C6B910E009B153A /* MQTTLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 84AA232D1C6B8BE5009B153A /* MQTTLog.h */; };
+		84AA232F1C6B910F009B153A /* MQTTLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 84AA232D1C6B8BE5009B153A /* MQTTLog.h */; };
+		84AA23301C6B910F009B153A /* MQTTLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 84AA232D1C6B8BE5009B153A /* MQTTLog.h */; };
+		84AA23321C6B913E009B153A /* MQTTLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 84AA232D1C6B8BE5009B153A /* MQTTLog.h */; };
 		84B1AFEE196C7AF60056B959 /* MQTTTestMultiThreading.m in Sources */ = {isa = PBXBuildFile; fileRef = 84B1AFED196C7AF60056B959 /* MQTTTestMultiThreading.m */; };
 		84B6A1891C133A9F00618573 /* MQTTTestWebsockets.m in Sources */ = {isa = PBXBuildFile; fileRef = 84B6A1881C133A9F00618573 /* MQTTTestWebsockets.m */; };
 		84B6A1A11C15E51300618573 /* MQTTTestWebsockets.m in Sources */ = {isa = PBXBuildFile; fileRef = 84B6A1881C133A9F00618573 /* MQTTTestWebsockets.m */; };
@@ -310,6 +314,7 @@
 		84998C871C0EDBAA00119061 /* MQTTSessionSynchron.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MQTTSessionSynchron.h; sourceTree = "<group>"; };
 		84998C881C0EDBAA00119061 /* MQTTSessionSynchron.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MQTTSessionSynchron.m; sourceTree = "<group>"; };
 		84A592131C3C5343008C5199 /* MQTTTransport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MQTTTransport.m; sourceTree = "<group>"; };
+		84AA232D1C6B8BE5009B153A /* MQTTLog.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MQTTLog.h; sourceTree = "<group>"; };
 		84B1AFED196C7AF60056B959 /* MQTTTestMultiThreading.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MQTTTestMultiThreading.m; sourceTree = "<group>"; };
 		84B1AFF0196D99170056B959 /* MQTTSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MQTTSessionManager.h; sourceTree = "<group>"; };
 		84B1AFF1196D99170056B959 /* MQTTSessionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MQTTSessionManager.m; sourceTree = "<group>"; };
@@ -576,6 +581,7 @@
 				846B90B71C15F9B3008A5D44 /* Core */,
 				846B90B81C15F9D4008A5D44 /* Persistence */,
 				846191321883E56800101409 /* MQTTClient.h */,
+				84AA232D1C6B8BE5009B153A /* MQTTLog.h */,
 				84B1AFF0196D99170056B959 /* MQTTSessionManager.h */,
 				84B1AFF1196D99170056B959 /* MQTTSessionManager.m */,
 				846191301883E56800101409 /* Supporting Files */,
@@ -739,6 +745,7 @@
 				841D0A8B1C358785006A82DC /* MQTTCoreDataPersistence.h in Headers */,
 				841D0A491C3585D4006A82DC /* MQTTSession.h in Headers */,
 				841D0A4A1C3585D4006A82DC /* MQTTSessionSynchron.h in Headers */,
+				84AA232E1C6B910E009B153A /* MQTTLog.h in Headers */,
 				841D0A4B1C3585D4006A82DC /* MQTTSessionLegacy.h in Headers */,
 				841D0A4C1C3585D4006A82DC /* MQTTPersistence.h in Headers */,
 				841D0A4F1C3585D4006A82DC /* MQTTClient.h in Headers */,
@@ -765,6 +772,7 @@
 				841D0A931C358818006A82DC /* MQTTSSLSecurityPolicy.h in Headers */,
 				841D0A961C35881D006A82DC /* MQTTSSLSecurityPolicyDecoder.h in Headers */,
 				841D0A5E1C358601006A82DC /* MQTTSessionSynchron.h in Headers */,
+				84AA232F1C6B910F009B153A /* MQTTLog.h in Headers */,
 				841D0A5F1C358601006A82DC /* MQTTSessionLegacy.h in Headers */,
 				841D0A601C358601006A82DC /* MQTTPersistence.h in Headers */,
 				841D0A631C358601006A82DC /* MQTTClient.h in Headers */,
@@ -791,6 +799,7 @@
 				841D0A941C358819006A82DC /* MQTTSSLSecurityPolicy.h in Headers */,
 				841D0A971C35881E006A82DC /* MQTTSSLSecurityPolicyDecoder.h in Headers */,
 				841D0A721C35861E006A82DC /* MQTTSessionSynchron.h in Headers */,
+				84AA23301C6B910F009B153A /* MQTTLog.h in Headers */,
 				841D0A731C35861E006A82DC /* MQTTSessionLegacy.h in Headers */,
 				841D0A741C35861E006A82DC /* MQTTPersistence.h in Headers */,
 				841D0A771C35861E006A82DC /* MQTTClient.h in Headers */,
@@ -811,6 +820,7 @@
 				841D0A9C1C358826006A82DC /* MQTTSSLSecurityPolicyTransport.h in Headers */,
 				845922A51C175AA400CCE27E /* MQTTCFSocketEncoder.h in Headers */,
 				84517CF01C17904D006FE09B /* MQTTClient-Prefix.pch in Headers */,
+				84AA23321C6B913E009B153A /* MQTTLog.h in Headers */,
 				841D0A9D1C358829006A82DC /* MQTTWebsocketTransport.h in Headers */,
 				841D0A9B1C358823006A82DC /* MQTTSSLSecurityPolicyEncoder.h in Headers */,
 				841D0A951C35881A006A82DC /* MQTTSSLSecurityPolicy.h in Headers */,
@@ -1667,6 +1677,7 @@
 				840487671C51212700569C79 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		8407163A1BBEF13A00FBB3CB /* Build configuration list for PBXNativeTarget "MQTTClientOSXTests" */ = {
 			isa = XCConfigurationList;

diff --git a/MQTTClient/MQTTClient/MQTTCFSocketDecoder.m b/MQTTClient/MQTTClient/MQTTCFSocketDecoder.m
@@ -7,20 +7,7 @@
 
 #import "MQTTCFSocketDecoder.h"
 
-#ifdef LUMBERJACK
-#define LOG_LEVEL_DEF ddLogLevel
-#import <CocoaLumberjack/CocoaLumberjack.h>
-#ifdef DEBUG
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#else
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#endif
-#else
-#define DDLogVerbose NSLog
-#define DDLogWarn NSLog
-#define DDLogInfo NSLog
-#define DDLogError NSLog
-#endif
+#import "MQTTLog.h"
 
 @interface MQTTCFSocketDecoder()
 

diff --git a/MQTTClient/MQTTClient/MQTTCFSocketEncoder.m b/MQTTClient/MQTTClient/MQTTCFSocketEncoder.m
@@ -7,20 +7,7 @@
 
 #import "MQTTCFSocketEncoder.h"
 
-#ifdef LUMBERJACK
-#define LOG_LEVEL_DEF ddLogLevel
-#import <CocoaLumberjack/CocoaLumberjack.h>
-#ifdef DEBUG
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#else
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#endif
-#else
-#define DDLogVerbose NSLog
-#define DDLogWarn NSLog
-#define DDLogInfo NSLog
-#define DDLogError NSLog
-#endif
+#import "MQTTLog.h"
 
 @interface MQTTCFSocketEncoder()
 @property (strong, nonatomic) NSMutableData *buffer;

diff --git a/MQTTClient/MQTTClient/MQTTCFSocketTransport.m b/MQTTClient/MQTTClient/MQTTCFSocketTransport.m
@@ -8,20 +8,7 @@
 
 #import "MQTTCFSocketTransport.h"
 
-#ifdef LUMBERJACK
-#define LOG_LEVEL_DEF ddLogLevel
-#import <CocoaLumberjack/CocoaLumberjack.h>
-#ifdef DEBUG
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#else
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#endif
-#else
-#define DDLogVerbose NSLog
-#define DDLogWarn NSLog
-#define DDLogInfo NSLog
-#define DDLogError NSLog
-#endif
+#import "MQTTLog.h"
 
 @interface MQTTCFSocketTransport()
 @property (strong, nonatomic) MQTTCFSocketEncoder *encoder;

diff --git a/MQTTClient/MQTTClient/MQTTCoreDataPersistence.m b/MQTTClient/MQTTClient/MQTTCoreDataPersistence.m
@@ -8,20 +8,7 @@
 
 #import "MQTTCoreDataPersistence.h"
 
-#ifdef LUMBERJACK
-#define LOG_LEVEL_DEF ddLogLevel
-#import <CocoaLumberjack/CocoaLumberjack.h>
-#ifdef DEBUG
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#else
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#endif
-#else
-#define DDLogVerbose NSLog
-#define DDLogWarn NSLog
-#define DDLogInfo NSLog
-#define DDLogError NSLog
-#endif
+#import "MQTTLog.h"
 
 static NSRecursiveLock *lock;
 static NSManagedObjectContext *parentManagedObjectContext;

diff --git a/MQTTClient/MQTTClient/MQTTDecoder.m b/MQTTClient/MQTTClient/MQTTDecoder.m
@@ -7,20 +7,7 @@
 
 #import "MQTTDecoder.h"
 
-#ifdef LUMBERJACK
-#define LOG_LEVEL_DEF ddLogLevel
-#import <CocoaLumberjack/CocoaLumberjack.h>
-#ifdef DEBUG
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#else
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#endif
-#else
-#define DDLogVerbose NSLog
-#define DDLogWarn NSLog
-#define DDLogInfo NSLog
-#define DDLogError NSLog
-#endif
+#import "MQTTLog.h"
 
 @interface MQTTDecoder()
 @property (nonatomic) NSMutableArray<NSInputStream *> *streams;

diff --git a/MQTTClient/MQTTClient/MQTTInMemoryPersistence.m b/MQTTClient/MQTTClient/MQTTInMemoryPersistence.m
@@ -8,20 +8,7 @@
 
 #import "MQTTInMemoryPersistence.h"
 
-#ifdef LUMBERJACK
-#define LOG_LEVEL_DEF ddLogLevel
-#import <CocoaLumberjack/CocoaLumberjack.h>
-#ifdef DEBUG
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#else
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#endif
-#else
-#define DDLogVerbose NSLog
-#define DDLogWarn NSLog
-#define DDLogInfo NSLog
-#define DDLogError NSLog
-#endif
+#import "MQTTLog.h"
 
 @implementation MQTTInMemoryFlow
 @synthesize clientId;

diff --git a/MQTTClient/MQTTClient/MQTTLog.h b/MQTTClient/MQTTClient/MQTTLog.h
@@ -0,0 +1,41 @@
+//
+//  MQTTLog.h
+//  MQTTClient
+//
+//  Created by Christoph Krey on 10.02.16.
+//  Copyright © 2016 Christoph Krey. All rights reserved.
+//
+
+#ifndef MQTTLog_h
+
+#define MQTTLog_h
+
+
+#ifdef LUMBERJACK
+    #define LOG_LEVEL_DEF ddLogLevel
+    #import <CocoaLumberjack/CocoaLumberjack.h>
+    #ifndef myLogLevel
+        #ifdef DEBUG
+            static const DDLogLevel ddLogLevel = DDLogLevelWarning;
+        #else
+            static const DDLogLevel ddLogLevel = DDLogLevelWarning;
+        #endif
+    #else
+        static const DDLogLevel ddLogLevel = myLogLevel;
+    #endif
+#else
+    #ifdef DEBUG
+        #define DDLogVerbose NSLog
+        #define DDLogWarn NSLog
+        #define DDLogInfo NSLog
+        #define DDLogError NSLog
+    #else
+        #define DDLogVerbose(...)
+        #define DDLogWarn(...)
+        #define DDLogInfo(...)
+        #define DDLogError(...)
+        #endif
+#endif
+
+
+#endif /* MQTTLog_h */
diff --git a/MQTTClient/MQTTClient/MQTTMessage.m b/MQTTClient/MQTTClient/MQTTMessage.m
@@ -19,20 +19,7 @@
 
 #import "MQTTMessage.h"
 
-#ifdef LUMBERJACK
-#define LOG_LEVEL_DEF ddLogLevel
-#import <CocoaLumberjack/CocoaLumberjack.h>
-#ifdef DEBUG
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#else
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#endif
-#else
-#define DDLogVerbose NSLog
-#define DDLogWarn NSLog
-#define DDLogInfo NSLog
-#define DDLogError NSLog
-#endif
+#import "MQTTLog.h"
 
 @implementation MQTTMessage
 

diff --git a/MQTTClient/MQTTClient/MQTTSSLSecurityPolicy.m b/MQTTClient/MQTTClient/MQTTSSLSecurityPolicy.m
@@ -29,6 +29,8 @@
 #import "MQTTSSLSecurityPolicy.h"
 #import <AssertMacros.h>
 
+#import "MQTTLog.h"
+
 static BOOL SSLSecKeyIsEqualToKey(SecKeyRef key1, SecKeyRef key2) {
     return [(__bridge id) key1 isEqual:(__bridge id) key2];
 }

diff --git a/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyDecoder.m b/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyDecoder.m
@@ -7,20 +7,7 @@
 
 #import "MQTTSSLSecurityPolicyDecoder.h"
 
-#ifdef LUMBERJACK
-#define LOG_LEVEL_DEF ddLogLevel
-#import <CocoaLumberjack/CocoaLumberjack.h>
-#ifdef DEBUG
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#else
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#endif
-#else
-#define DDLogVerbose NSLog
-#define DDLogWarn NSLog
-#define DDLogInfo NSLog
-#define DDLogError NSLog
-#endif
+#import "MQTTLog.h"
 
 @interface MQTTSSLSecurityPolicyDecoder()
 @property (nonatomic) BOOL securityPolicyApplied;

diff --git a/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyEncoder.m b/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyEncoder.m
@@ -7,21 +7,7 @@
 
 #import "MQTTSSLSecurityPolicyEncoder.h"
 
-#ifdef LUMBERJACK
-#define LOG_LEVEL_DEF ddLogLevel
-#import <CocoaLumberjack/CocoaLumberjack.h>
-#ifdef DEBUG
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#else
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#endif
-#else
-#define DDLogVerbose NSLog
-#define DDLogWarn NSLog
-#define DDLogInfo NSLog
-#define DDLogError NSLog
-#endif
-
+#import "MQTTLog.h"
 
 @interface MQTTSSLSecurityPolicyEncoder()
 @property (nonatomic) BOOL securityPolicyApplied;

diff --git a/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyTransport.m b/MQTTClient/MQTTClient/MQTTSSLSecurityPolicyTransport.m
@@ -10,20 +10,7 @@
 #import "MQTTSSLSecurityPolicyEncoder.h"
 #import "MQTTSSLSecurityPolicyDecoder.h"
 
-#ifdef LUMBERJACK
-#define LOG_LEVEL_DEF ddLogLevel
-#import <CocoaLumberjack/CocoaLumberjack.h>
-#ifdef DEBUG
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#else
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#endif
-#else
-#define DDLogVerbose NSLog
-#define DDLogWarn NSLog
-#define DDLogInfo NSLog
-#define DDLogError NSLog
-#endif
+#import "MQTTLog.h"
 
 @interface MQTTSSLSecurityPolicyTransport()
 @property (strong, nonatomic) MQTTSSLSecurityPolicyEncoder *encoder;

diff --git a/MQTTClient/MQTTClient/MQTTSession.m b/MQTTClient/MQTTClient/MQTTSession.m
@@ -11,20 +11,9 @@
 #import "MQTTMessage.h"
 #import "MQTTCoreDataPersistence.h"
 
-#ifdef LUMBERJACK
-#define LOG_LEVEL_DEF ddLogLevel
-#import <CocoaLumberjack/CocoaLumberjack.h>
-#ifdef DEBUG
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#else
-static const DDLogLevel ddLogLevel = DDLogLevelWarning;
-#endif
-#else
-#define DDLogVerbose NSLog
-#define DDLogWarn NSLog
-#define DDLogInfo NSLog
-#define DDLogError NSLog
-#endif
+//#define myLogLevel DDLogLevelVerbose
+
+#import "MQTTLog.h"
 
 @interface MQTTSession() <MQTTDecoderDelegate, MQTTTransportDelegate>