[#449] updated CocoaLumberjack to v. 2.x

hivewallet · Apr 4, 2015 · bfb1eba · bfb1eba
1 parent a339f1c
commit bfb1eba
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 48 deletions.
diff --git a/Hive/Formatters/HILogFormatter.h b/Hive/Formatters/HILogFormatter.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2013 Hive Developers. All rights reserved.
 //
 
-#import <CocoaLumberjack/DDLog.h>
+#import <CocoaLumberjack/CocoaLumberjack.h>
 
 /*
  Implementation of a CocoaLumberjack log formatter used for formatting log entries for the file in ~/Library/Logs

diff --git a/Hive/Formatters/HILogFormatter.m b/Hive/Formatters/HILogFormatter.m
@@ -13,31 +13,33 @@ @implementation HILogFormatter
 - (NSString *)formatLogMessage:(DDLogMessage *)message {
     NSString *logLevel;
 
-    switch (message->logFlag) {
-        case LOG_FLAG_ERROR:
+    switch (message->_flag) {
+        case DDLogFlagError:
             logLevel = @"ERROR";
             break;
-        case LOG_FLAG_WARN:
+        case DDLogFlagWarning:
             logLevel = @"WARN";
             break;
-        case LOG_FLAG_INFO:
+        case DDLogFlagInfo:
             logLevel = @"INFO";
             break;
-        case LOG_FLAG_DEBUG:
+        case DDLogFlagDebug:
             logLevel = @"DEBUG";
             break;
-        case LOG_FLAG_VERBOSE:
+        case DDLogFlagVerbose:
             logLevel = @"VERBOSE";
             break;
         default:
             logLevel = @"UNKNOWN";
     }
 
-    NSString *fileName = [[NSString stringWithUTF8String:message->file] lastPathComponent];
-
-    return [NSString stringWithFormat:@"%@ %s (%@:%d)\n%@: %@\n",
-            message->timestamp, message->function, fileName, message->lineNumber,
-            logLevel, message->logMsg];
+    return [NSString stringWithFormat:@"%@ %@ (%@:%lu)\n%@: %@\n",
+            message->_timestamp,
+            message->_function,
+            [message->_file lastPathComponent],
+            message->_line,
+            logLevel,
+            message->_message];
 }
 
 @end
diff --git a/Hive/HIAppDelegate.m b/Hive/HIAppDelegate.m
@@ -8,10 +8,7 @@
 
 #import <BitcoinJKit/HIBitcoinErrorCodes.h>
 #import <BitcoinJKit/HIBitcoinManager.h>
-#import <CocoaLumberjack/DDASLLogger.h>
-#import <CocoaLumberjack/DDFileLogger.h>
-#import <CocoaLumberjack/DDLog.h>
-#import <CocoaLumberjack/DDTTYLogger.h>
+#import <CocoaLumberjack/CocoaLumberjack.h>
 #import <HockeySDK/HockeySDK.h>
 #import <Sparkle/Sparkle.h>
 
@@ -49,13 +46,6 @@
 #import "PFMoveApplication.h"
 
 static NSString * const LastVersionKey = @"LastHiveVersion";
-static int ddLogLevel = LOG_LEVEL_VERBOSE;
-
-@interface DDLog (ExposePrivateMethod)
-
-+ (void)queueLogMessage:(DDLogMessage *)logMessage asynchronously:(BOOL)asyncFlag;
-
-@end
 
 @interface HIAppDelegate () <BITHockeyManagerDelegate, SUUpdaterDelegate> {
     HIMainWindowController *_mainWindowController;
@@ -143,8 +133,8 @@ - (void)configureLoggers {
     HILogFormatter *formatter = [HILogFormatter new];
 
     // default loggers - Console.app and Xcode console
-    [DDLog addLogger:[DDASLLogger sharedInstance] withLogLevel:LOG_LEVEL_WARN];
-    [DDLog addLogger:[DDTTYLogger sharedInstance] withLogLevel:LOG_LEVEL_VERBOSE];
+    [DDLog addLogger:[DDASLLogger sharedInstance] withLevel:DDLogLevelWarning];
+    [DDLog addLogger:[DDTTYLogger sharedInstance] withLevel:DDLogLevelVerbose];
     [[DDTTYLogger sharedInstance] setLogFormatter:formatter];
 
     // file logger manager config - keep 4 log files
@@ -157,7 +147,7 @@ - (void)configureLoggers {
     fileLogger.maximumFileSize = 10 * 1024 * 1024;
     fileLogger.logFormatter = formatter;
 
-    [DDLog addLogger:fileLogger withLogLevel:LOG_LEVEL_VERBOSE];
+    [DDLog addLogger:fileLogger withLevel:DDLogLevelVerbose];
 
     // configure BitcoinKit logger to use CocoaLumberjack system
     [[HILogger sharedLogger] setLogHandler:logHandler];
@@ -609,34 +599,35 @@ - (void)handlePaymentRequestLoadError:(NSError *)error {
 static void (^logHandler)(const char*, const char*, int, HILoggerLevel, NSString*) =
     ^(const char *fileName, const char *functionName, int lineNumber, HILoggerLevel level, NSString *message) {
 
-    int flag;
+    DDLogFlag flag;
 
     switch (level) {
         case HILoggerLevelInfo:
-            flag = LOG_FLAG_INFO;
+            flag = DDLogFlagInfo;
             break;
         case HILoggerLevelWarn:
-            flag = LOG_FLAG_WARN;
+            flag = DDLogFlagWarning;
             break;
         case HILoggerLevelError:
-            flag = LOG_FLAG_ERROR;
+            flag = DDLogFlagError;
             break;
         default:
-            flag = LOG_FLAG_DEBUG;
+            flag = DDLogFlagDebug;
             break;
     }
 
-    DDLogMessage *log = [[DDLogMessage alloc] initWithLogMsg:message
-                                                       level:ddLogLevel
-                                                        flag:flag
-                                                     context:0
-                                                        file:fileName
-                                                    function:functionName
-                                                        line:lineNumber
-                                                         tag:nil
-                                                     options:DDLogMessageCopyFile | DDLogMessageCopyFunction];
-
-    [DDLog queueLogMessage:log asynchronously:YES];
+    DDLogMessage *log = [[DDLogMessage alloc] initWithMessage:message
+                                                        level:LOG_LEVEL_DEF
+                                                         flag:flag
+                                                      context:0
+                                                         file:[NSString stringWithFormat:@"%s", fileName]
+                                                     function:[NSString stringWithFormat:@"%s", functionName]
+                                                         line:lineNumber
+                                                          tag:nil
+                                                      options:(DDLogMessageCopyFile | DDLogMessageCopyFunction)
+                                                    timestamp:nil];
+
+    [DDLog log:YES message:log];
 };
 
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,11 +1,14 @@
 PODS:
   - AFNetworking (1.3.4)
   - AutoLayoutMacros (1.0)
-  - CocoaLumberjack (1.9.2):
-    - CocoaLumberjack/Extensions (= 1.9.2)
-  - CocoaLumberjack/Core (1.9.2)
-  - CocoaLumberjack/Extensions (1.9.2):
+  - CocoaLumberjack (2.0.0):
+    - CocoaLumberjack/Default (= 2.0.0)
+    - CocoaLumberjack/Extensions (= 2.0.0)
+  - CocoaLumberjack/Core (2.0.0)
+  - CocoaLumberjack/Default (2.0.0):
     - CocoaLumberjack/Core
+  - CocoaLumberjack/Extensions (2.0.0):
+    - CocoaLumberjack/Default
   - FontAwesomeIconFactory (1.4)
   - INAppStoreWindow (1.4)
   - Kiwi (2.3.1)
@@ -37,7 +40,7 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   AFNetworking: cf8e418e16f0c9c7e5c3150d019a3c679d015018
   AutoLayoutMacros: e58619696a6d0c633081cd66edf52f57ceff1ccd
-  CocoaLumberjack: 628fca2e88ef06f7cf6817309aa405f325d9a6fa
+  CocoaLumberjack: a6f77d987d65dc7ba86b0f84db7d0b9084f77bcb
   FontAwesomeIconFactory: 4b6d0a8d90b2604a2518e34d15bbc100af99f11c
   INAppStoreWindow: 4fd569f7435557239e78316de139e886ccbaec4d
   Kiwi: f038a6c61f7a9e4d7766bff5717aa3b3fdb75f55
@@ -49,4 +52,4 @@ SPEC CHECKSUMS:
   Sparkle: 3adb45d38bcdf80caf505f2b4cd693031db70835
   ZXingObjC: ae99f1ef6d791ebe4a508f1bec20b2d7a20288c5
 
-COCOAPODS: 0.36.0
+COCOAPODS: 0.36.3