Skip to content

Commit

Permalink
renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
Francesco Ceravolo authored and Francesco Ceravolo committed May 8, 2017
1 parent 9a654b5 commit c5146e0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Blabber/Classes/Base/obj-c/SDLogger.h
Expand Up @@ -14,7 +14,7 @@

#import <Foundation/Foundation.h>
#if __has_include("CocoaLumberjack.h") || __has_include("CocoaLumberjack/CocoaLumberjack.h")
#define HAS_COCOALUMBERJACK 1
#define COCOALUMBERJACK_AVAILABLE 1
#import <CocoaLumberjack/CocoaLumberjack.h>
#endif

Expand Down
10 changes: 5 additions & 5 deletions Blabber/Classes/Base/obj-c/SDLogger.m
Expand Up @@ -15,15 +15,15 @@
#import "SDLogger.h"
#import "DDLog.h"

#ifdef HAS_COCOALUMBERJACK
#ifdef COCOALUMBERJACK_AVAILABLE
#import "SDDDFormatter.h"
#endif

#define kGenericModuleName @"SDLogger.Generic"

@interface SDLoggerUtils : NSObject

#ifdef HAS_COCOALUMBERJACK
#ifdef COCOALUMBERJACK_AVAILABLE
+ (DDLogLevel)ddLogLevelFromSDLogLevel:(SDLogLevel)level;
+ (DDLogFlag)ddLogFlagFromSDLogLevel:(SDLogLevel)level;
#endif
Expand All @@ -33,7 +33,7 @@ + (DDLogFlag)ddLogFlagFromSDLogLevel:(SDLogLevel)level;
@implementation SDLoggerUtils


#ifdef HAS_COCOALUMBERJACK
#ifdef COCOALUMBERJACK_AVAILABLE
/**
* utility method to convert SDLogLevel into corresponding DDLogLevel
*/
Expand Down Expand Up @@ -179,7 +179,7 @@ - (void)setup

- (void) setupWithLoggers:(NSArray*)loggers
{
#ifdef HAS_COCOALUMBERJACK
#ifdef COCOALUMBERJACK_AVAILABLE
// default setup
if (loggers.count == 0)
{
Expand Down Expand Up @@ -302,7 +302,7 @@ - (void) logWithLevel:(SDLogLevel)level module:(NSString *)module file:(NSString
// Log with CocoaLumberjack
if (format)
{
#ifdef HAS_COCOALUMBERJACK
#ifdef COCOALUMBERJACK_AVAILABLE
[DDLog log:!syncLog
level:[SDLoggerUtils ddLogLevelFromSDLogLevel:level]
flag:[SDLoggerUtils ddLogFlagFromSDLogLevel:level]
Expand Down

0 comments on commit c5146e0

Please sign in to comment.