Simplify AILogger by making it completely static

Author: wellle

AdjustIo/AILogger.h

@@ -18,27 +18,13 @@ typedef enum {
 // A simple logger with multiple log levels.
 @interface AILogger : NSObject
 
-@property (copy) NSString *logTag;
-@property (assign) AILogLevel logLevel;
-
-// convenience methods
-+ (void)setLogTag:(NSString *)logTag;
 + (void)setLogLevel:(AILogLevel)logLevel;
+
 + (void)verbose:(NSString *)message, ...;
 + (void)debug:  (NSString *)message, ...;
 + (void)info:   (NSString *)message, ...;
 + (void)warn:   (NSString *)message, ...;
 + (void)error:  (NSString *)message, ...;
 + (void)assert: (NSString *)message, ...;
 
-+ (AILogger *)loggerWithTag:(NSString *)logTag;
-- (id)initWithTag:(NSString *)logTag;
-
-- (void)verbose:(NSString *)message, ...;
-- (void)debug:  (NSString *)message, ...;
-- (void)info:   (NSString *)message, ...;
-- (void)warn:   (NSString *)message, ...;
-- (void)error:  (NSString *)message, ...;
-- (void)assert: (NSString *)message, ...;
-
 @end

AdjustIo/AILogger.m

@@ -8,122 +8,63 @@
 
 #import "AILogger.h"
 
-static AILogger *defaultLogger;
+static NSString * const kLogTag = @"AdjustIo";
+
+static AILogLevel staticLogLevel = AILogLevelInfo;
 
 
 #pragma mark -
 @implementation AILogger
 
-+ (void)setLogTag:(NSString *)logTag {
-    AILogger.getDefaultLogger.logTag = logTag;
-}
-
 + (void)setLogLevel:(AILogLevel)logLevel {
-    AILogger.getDefaultLogger.logLevel = logLevel;
-}
-
-+ (AILogger *)loggerWithTag:(NSString *)logTag {
-    return [[AILogger alloc] initWithTag:logTag];
-}
-
-- (id)initWithTag:(NSString *)tag {
-    self = [super init];
-    if (self == nil) return nil;
-
-    self.logTag = tag;
-    self.logLevel = AILogLevelInfo;
-
-    return self;
-}
-
-- (void)verbose:(NSString *)format, ... {
-    if (self.logLevel > AILogLevelVerbose) return;
-    va_list parameters; va_start(parameters, format);
-    [self logLevel:@"v" format:format parameters:parameters];
-}
-
-- (void)debug:(NSString *)format, ... {
-    if (self.logLevel > AILogLevelDebug) return;
-    va_list parameters; va_start(parameters, format);
-    [self logLevel:@"d" format:format parameters:parameters];
-}
-
-- (void)info:(NSString *)format, ... {
-    if (self.logLevel > AILogLevelInfo) return;
-    va_list parameters; va_start(parameters, format);
-    [self logLevel:@"i" format:format parameters:parameters];
-}
-
-- (void)warn:(NSString *)format, ... {
-    if (self.logLevel > AILogLevelWarn) return;
-    va_list parameters; va_start(parameters, format);
-    [self logLevel:@"w" format:format parameters:parameters];
-}
-
-- (void)error:(NSString *)format, ... {
-    if (self.logLevel > AILogLevelError) return;
-    va_list parameters; va_start(parameters, format);
-    [self logLevel:@"e" format:format parameters:parameters];
-}
-
-- (void)assert: (NSString *)format, ... {
-    if (self.logLevel > AILogLevelAssert) return;
-    va_list parameters; va_start(parameters, format);
-    [self logLevel:@"a" format:format parameters:parameters];
+    staticLogLevel = logLevel;
 }
 
 + (void)verbose:(NSString *)format, ... {
-    if (AILogger.getDefaultLogger.logLevel > AILogLevelVerbose) return;
+    if (staticLogLevel > AILogLevelVerbose) return;
     va_list parameters; va_start(parameters, format);
-    [AILogger.getDefaultLogger logLevel:@"v" format:format parameters:parameters];
+    [self logLevel:@"v" format:format parameters:parameters];
 }
 
 + (void)debug:(NSString *)format, ... {
-    if (AILogger.getDefaultLogger.logLevel > AILogLevelDebug) return;
+    if (staticLogLevel > AILogLevelDebug) return;
     va_list parameters; va_start(parameters, format);
-    [AILogger.getDefaultLogger logLevel:@"d" format:format parameters:parameters];
+    [self logLevel:@"d" format:format parameters:parameters];
 }
 
 + (void)info:(NSString *)format, ... {
-    if (AILogger.getDefaultLogger.logLevel > AILogLevelInfo) return;
+    if (staticLogLevel > AILogLevelInfo) return;
     va_list parameters; va_start(parameters, format);
-    [AILogger.getDefaultLogger logLevel:@"i" format:format parameters:parameters];
+    [self logLevel:@"i" format:format parameters:parameters];
 }
 
 + (void)warn:(NSString *)format, ... {
-    if (AILogger.getDefaultLogger.logLevel > AILogLevelWarn) return;
+    if (staticLogLevel > AILogLevelWarn) return;
     va_list parameters; va_start(parameters, format);
-    [AILogger.getDefaultLogger logLevel:@"w" format:format parameters:parameters];
+    [self logLevel:@"w" format:format parameters:parameters];
 }
 
 + (void)error:(NSString *)format, ... {
-    if (AILogger.getDefaultLogger.logLevel > AILogLevelError) return;
+    if (staticLogLevel > AILogLevelError) return;
     va_list parameters; va_start(parameters, format);
-    [AILogger.getDefaultLogger logLevel:@"e" format:format parameters:parameters];
+    [self logLevel:@"e" format:format parameters:parameters];
 }
 
 + (void)assert:(NSString *)format, ... {
-    if (AILogger.getDefaultLogger.logLevel > AILogLevelAssert) return;
+    if (staticLogLevel > AILogLevelAssert) return;
     va_list parameters; va_start(parameters, format);
-    [AILogger.getDefaultLogger logLevel:@"a" format:format parameters:parameters];
+    [self logLevel:@"a" format:format parameters:parameters];
 }
 
-- (void)logLevel:(NSString *)logLevel format:(NSString *)format parameters:(va_list) parameters {
+// private implementation
++ (void)logLevel:(NSString *)logLevel format:(NSString *)format parameters:(va_list)parameters {
     NSString *string = [[NSString alloc] initWithFormat:format arguments:parameters];
     va_end(parameters);
 
     NSArray *lines = [string componentsSeparatedByString:@"\n"];
     for (NSString *line in lines) {
-        NSLog(@"\t[%@]%@: %@", self.logTag, logLevel, line);
-    }
-}
-
-#pragma mark private
-+ (AILogger *)getDefaultLogger {
-    if (defaultLogger == nil) {
-        defaultLogger = [AILogger loggerWithTag:@"AdjustIo"];
+        NSLog(@"\t[%@]%@: %@", kLogTag, logLevel, line);
     }
-    return defaultLogger;
 }
 
 @end