Upgraded CocoaLumberjack to version 1.8.1

robbiehanson · May 22, 2014 · 7121f87 · 7121f87 · jonasman · Jun 4, 2014
1 parent 1644a21
commit 7121f87
Show file tree

Hide file tree

Showing 21 changed files with 4,713 additions and 4,032 deletions.
diff --git a/Vendor/CocoaLumberjack/DDASLLogger.h b/Vendor/CocoaLumberjack/DDASLLogger.h
@@ -7,10 +7,10 @@
  * Welcome to Cocoa Lumberjack!
  * 
  * The project page has a wealth of documentation if you have any questions.
- * https://github.com/robbiehanson/CocoaLumberjack
+ * https://github.com/CocoaLumberjack/CocoaLumberjack
  * 
  * If you're new to the project you may wish to read the "Getting Started" wiki.
- * https://github.com/robbiehanson/CocoaLumberjack/wiki/GettingStarted
+ * https://github.com/CocoaLumberjack/CocoaLumberjack/wiki/GettingStarted
  * 
  * 
  * This class provides a logger for the Apple System Log facility.
@@ -28,10 +28,10 @@
 
 @interface DDASLLogger : DDAbstractLogger <DDLogger>
 {
-	aslclient client;
+    aslclient client;
 }
 
-+ (DDASLLogger *)sharedInstance;
++ (instancetype)sharedInstance;
 
 // Inherited from DDAbstractLogger
 

diff --git a/Vendor/CocoaLumberjack/DDASLLogger.m b/Vendor/CocoaLumberjack/DDASLLogger.m
@@ -6,10 +6,10 @@
  * Welcome to Cocoa Lumberjack!
  * 
  * The project page has a wealth of documentation if you have any questions.
- * https://github.com/robbiehanson/CocoaLumberjack
+ * https://github.com/CocoaLumberjack/CocoaLumberjack
  * 
  * If you're new to the project you may wish to read the "Getting Started" wiki.
- * https://github.com/robbiehanson/CocoaLumberjack/wiki/GettingStarted
+ * https://github.com/CocoaLumberjack/CocoaLumberjack/wiki/GettingStarted
 **/
 
 #if ! __has_feature(objc_arc)
@@ -31,69 +31,70 @@ @implementation DDASLLogger
 **/
 + (void)initialize
 {
-	static BOOL initialized = NO;
+    static BOOL initialized = NO;
-	if (!initialized)
+    if (!initialized)
-	{
+    {
-		initialized = YES;
+        initialized = YES;
-		
+        
-		sharedInstance = [[DDASLLogger alloc] init];
+        sharedInstance = [[[self class] alloc] init];
-	}
+    }
 }
 
-+ (DDASLLogger *)sharedInstance
++ (instancetype)sharedInstance
 {
-	return sharedInstance;
+    return sharedInstance;
 }
 
 - (id)init
 {
-	if (sharedInstance != nil)
+    if (sharedInstance != nil)
-	{
+    {
-		return nil;
+        return nil;
-	}
+    }
-	
+    
-	if ((self = [super init]))
+    if ((self = [super init]))
-	{
+    {
-		// A default asl client is provided for the main thread,
+        // A default asl client is provided for the main thread,
-		// but background threads need to create their own client.
+        // but background threads need to create their own client.
-		
+        
-		client = asl_open(NULL, "com.apple.console", 0);
+        client = asl_open(NULL, "com.apple.console", 0);
-	}
+    }
-	return self;
+    return self;
 }
 
 - (void)logMessage:(DDLogMessage *)logMessage
 {
-	NSString *logMsg = logMessage->logMsg;
+    NSString *logMsg = logMessage->logMsg;
-
+
-	if (formatter)
+    if (formatter)
-	{
+    {
-		logMsg = [formatter formatLogMessage:logMessage];
+        logMsg = [formatter formatLogMessage:logMessage];
-	}
+    }
-
+
-	if (logMsg)
+    if (logMsg)
-	{
+    {
-		const char *msg = [logMsg UTF8String];
+        const char *msg = [logMsg UTF8String];
-
+
-		int aslLogLevel;
+        int aslLogLevel;
-		switch (logMessage->logFlag)
+        switch (logMessage->logFlag)
-		{
+        {
-			// Note: By default ASL will filter anything above level 5 (Notice).
+            // Note: By default ASL will filter anything above level 5 (Notice).
-			// So our mappings shouldn't go above that level.
+            // So our mappings shouldn't go above that level.
-
+
-			case LOG_FLAG_ERROR : aslLogLevel = ASL_LEVEL_CRIT;    break;
+            case LOG_FLAG_ERROR : aslLogLevel = ASL_LEVEL_ALERT;   break;
-			case LOG_FLAG_WARN  : aslLogLevel = ASL_LEVEL_ERR;     break;
+            case LOG_FLAG_WARN  : aslLogLevel = ASL_LEVEL_CRIT;    break;
-			case LOG_FLAG_INFO  : aslLogLevel = ASL_LEVEL_WARNING; break;
+            case LOG_FLAG_INFO  : aslLogLevel = ASL_LEVEL_ERR;     break;
-			default             : aslLogLevel = ASL_LEVEL_NOTICE;  break;
+            case LOG_FLAG_DEBUG : aslLogLevel = ASL_LEVEL_WARNING; break;
-		}
+            default             : aslLogLevel = ASL_LEVEL_NOTICE;  break;
-
+        }
-		asl_log(client, NULL, aslLogLevel, "%s", msg);
+
-	}
+        asl_log(client, NULL, aslLogLevel, "%s", msg);
+    }
 }
 
 - (NSString *)loggerName
 {
-	return @"cocoa.lumberjack.aslLogger";
+    return @"cocoa.lumberjack.aslLogger";
 }
 
 @end
diff --git a/Vendor/CocoaLumberjack/DDAbstractDatabaseLogger.h b/Vendor/CocoaLumberjack/DDAbstractDatabaseLogger.h
@@ -6,10 +6,10 @@
  * Welcome to Cocoa Lumberjack!
  * 
  * The project page has a wealth of documentation if you have any questions.
- * https://github.com/robbiehanson/CocoaLumberjack
+ * https://github.com/CocoaLumberjack/CocoaLumberjack
  * 
  * If you're new to the project you may wish to read the "Getting Started" wiki.
- * https://github.com/robbiehanson/CocoaLumberjack/wiki/GettingStarted
+ * https://github.com/CocoaLumberjack/CocoaLumberjack/wiki/GettingStarted
  * 
  * 
  * This class provides an abstract implementation of a database logger.
@@ -21,18 +21,18 @@
 
 @interface DDAbstractDatabaseLogger : DDAbstractLogger {
 @protected
-	NSUInteger saveThreshold;
+    NSUInteger saveThreshold;
-	NSTimeInterval saveInterval;
+    NSTimeInterval saveInterval;
-	NSTimeInterval maxAge;
+    NSTimeInterval maxAge;
-	NSTimeInterval deleteInterval;
+    NSTimeInterval deleteInterval;
-	BOOL deleteOnEverySave;
+    BOOL deleteOnEverySave;
-	
+    
-	BOOL saveTimerSuspended;
+    BOOL saveTimerSuspended;
-	NSUInteger unsavedCount;
+    NSUInteger unsavedCount;
-	dispatch_time_t unsavedTime;
+    dispatch_time_t unsavedTime;
-	dispatch_source_t saveTimer;
+    dispatch_source_t saveTimer;
-	dispatch_time_t lastDeleteTime;
+    dispatch_time_t lastDeleteTime;
-	dispatch_source_t deleteTimer;
+    dispatch_source_t deleteTimer;
 }
 
 /**