Allow custom instances of SLLoggerController

* Mirror class 'shared' methods with instance methods. Instance methods contain the code, class methods call instance ones on the sharedController

Author: joeljfischer

SuperLogger/SLLoggerController.h

@@ -55,6 +55,10 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (assign, nonatomic) SLLogLevel globalLogLevel;
 
+/**
+ *  Shared Controller methods are class methods that automatically target the sharedController instance. Since 99% of the time you will want to use the sharedController, these are considered convenience methods.
+ */
+#pragma mark - Shared Controller methods
 
 + (SLLoggerController *)sharedController;
 
@@ -80,7 +84,33 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (void)searchStoredLogsWithFilters:(NSArray<SLLogFilterBlock> *)searchFilters completion:(SLSearchCompletionBlock)completionBlock;
 
-+ (void)logStringWithLevel:(SLLogLevel)level fileName:(NSString *)fileName functionName:(NSString *)functionName line:(NSInteger)line message:(NSString *)message, ... NS_FORMAT_FUNCTION(5, 6);
++ (void)logStringWithLevel:(SLLogLevel)level
+                  fileName:(NSString *)fileName
+              functionName:(NSString *)functionName
+                      line:(NSInteger)line
+                   message:(NSString *)message, ... NS_FORMAT_FUNCTION(5, 6);
+
+
+#pragma mark - Instance Methods
+
+- (void)addLoggers:(NSArray<id<SLLogger>> *)loggers;
+- (void)addModules:(NSArray<SLFileModule *> *)modules;
+- (void)addFilters:(NSArray<SLLogFilterBlock> *)filters;
+
+- (void)removeLoggers:(NSArray<id<SLLogger>> *)loggers;
+- (void)removeModules:(NSArray<SLFileModule *> *)modules;
+- (void)removeFilters:(NSArray<SLLogFilterBlock> *)filters;
+
+- (SLLogLevel)logLevelForFile:(NSString *)file;
+
+- (void)logStringWithLevel:(SLLogLevel)level
+                  fileName:(NSString *)fileName
+              functionName:(NSString *)functionName
+                      line:(NSInteger)line
+                   message:(NSString *)message, ... NS_FORMAT_FUNCTION(5, 6);
+
+
+#pragma mark - Shared Queue
 
 + (dispatch_queue_t)globalLogQueue;
 

SuperLogger/SLLoggerController.m

@@ -60,7 +60,32 @@ - (instancetype)init {
 
 #pragma mark - Set adding / removing
 
+#pragma Shared Instance
 + (void)addLoggers:(NSArray<id<SLLogger>> *)loggers {
+    [[self.class sharedController] addLoggers:loggers];
+}
+
++ (void)addModules:(NSArray<SLFileModule *> *)modules {
+    [[self.class sharedController] addModules:modules];
+}
+
++ (void)addFilters:(NSArray<SLLogFilterBlock> *)filters {
+    [[self.class sharedController] addFilters:filters];
+}
+
++ (void)removeLoggers:(NSArray<id<SLLogger>> *)loggers {
+    [[self.class sharedController] removeLoggers:loggers];
+}
+
++ (void)removeModules:(NSArray<SLFileModule *> *)modules {
+    [[self.class sharedController] removeModules:modules];
+}
+
++ (void)removeFilters:(NSArray<SLLogFilterBlock> *)filters {
+    [[self.class sharedController] removeFilters:filters];
+}
+
+- (void)addLoggers:(NSArray<id<SLLogger>> *)loggers {
     dispatch_async([self.class globalLogQueue], ^{ @autoreleasepool {
         for (id<SLLogger> logger in loggers) {
 #ifndef DEBUG
@@ -76,19 +101,20 @@ + (void)addLoggers:(NSArray<id<SLLogger>> *)loggers {
     }});
 }
 
-+ (void)addModules:(NSArray<SLFileModule *> *)modules {
+#pragma Instance Methods
+- (void)addModules:(NSArray<SLFileModule *> *)modules {
     dispatch_async([self.class globalLogQueue], ^{ @autoreleasepool {
         [[self.class sharedController].mutableLogModules addObjectsFromArray:modules];
     }});
 }
 
-+ (void)addFilters:(NSArray<SLLogFilterBlock> *)filters {
+- (void)addFilters:(NSArray<SLLogFilterBlock> *)filters {
     dispatch_async([self.class globalLogQueue], ^{ @autoreleasepool {
         [[self.class sharedController].mutableLogFilters addObjectsFromArray:filters];
     }});
 }
 
-+ (void)removeLoggers:(NSArray<id<SLLogger>> *)loggers {
+- (void)removeLoggers:(nonnull NSArray<id<SLLogger>> *)loggers {
     dispatch_async([self.class globalLogQueue], ^{
         for (id<SLLogger> logger in loggers) {
             [logger teardownLogger];
@@ -97,15 +123,15 @@ + (void)removeLoggers:(NSArray<id<SLLogger>> *)loggers {
     });
 }
 
-+ (void)removeModules:(NSArray<SLFileModule *> *)modules {
+- (void)removeModules:(NSArray<SLFileModule *> *)modules {
     dispatch_async([self.class globalLogQueue], ^{
         for (SLFileModule *module in modules) {
             [[self.class sharedController].mutableLogModules removeObject:module];
         }
     });
 }
 
-+ (void)removeFilters:(NSArray<SLLogFilterBlock> *)filters {
+- (void)removeFilters:(NSArray<SLLogFilterBlock> *)filters {
     dispatch_async([self.class globalLogQueue], ^{
         for (SLLogFilterBlock filter in filters) {
             [[self.class sharedController].mutableLogFilters removeObject:filter];
@@ -117,6 +143,10 @@ + (void)removeFilters:(NSArray<SLLogFilterBlock> *)filters {
 #pragma mark - Log Level
 
 + (SLLogLevel)logLevelForFile:(NSString *)file {
+    return [[self.class sharedController] logLevelForFile:file];
+}
+
+- (SLLogLevel)logLevelForFile:(NSString *)file {
     for (SLFileModule *module in [self.class sharedController].logModules) {
         if ([module containsFile:file]) {
             return module.logLevel;
@@ -151,6 +181,13 @@ - (void)setDefaultFormatBlock:(SLLogFormatBlock)defaultFormatBlock {
 #pragma mark - Logging
 
 + (void)logStringWithLevel:(SLLogLevel)level fileName:(NSString *)fileName functionName:(NSString *)functionName line:(NSInteger)line message:(NSString *)message, ... {
+    va_list args;
+    va_start(args, message);
+    
+    [[self.class sharedController] logStringWithLevel:level fileName:fileName functionName:functionName line:line message:message, args];
+}
+
+- (void)logStringWithLevel:(SLLogLevel)level fileName:(NSString *)fileName functionName:(NSString *)functionName line:(NSInteger)line message:(NSString *)message, ... {
     NSDate *timestamp = [NSDate date];
     NSArray *callstack = [NSThread callStackSymbols];
 #pragma clang diagnostic push
@@ -163,7 +200,7 @@ + (void)logStringWithLevel:(SLLogLevel)level fileName:(NSString *)fileName funct
     NSString *format = [[NSString alloc] initWithFormat:message arguments:args];
 
     SLLog *log = [[SLLog alloc] initWithMessage:format timestamp:timestamp level:level fileName:fileName functionName:functionName line:line queueLabel:currentQueueLabel callstack:callstack];
-    [[self sharedController] sl_logMessage:log];
+    [self sl_logMessage:log];
 }
 
 - (void)sl_logMessage:(SLLog *)log {