Skip to content

Modify ddLogLevel to MQTTLogLevel as suggested by CocoaLumberjack #572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modify ddLogLevel to MQTTLogLevel as suggested by CocoaLumberjack #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Modify ddLogLevel to MQTTLogLevel as suggested by CocoaLumberjack
  • Loading branch information
@TixXie
TixXie committed Sep 26, 2020
commit e1e836c20eddd11b6d8c312d0b3cc3022f0d425a
14 changes: 7 additions & 7 deletions MQTTClient/MQTTClient/MQTTLog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#ifdef LUMBERJACK

#define LOG_LEVEL_DEF ddLogLevel
#define LOG_LEVEL_DEF MQTTLogLevel
#import <CocoaLumberjack/CocoaLumberjack.h>

#else /* LUMBERJACK */
Expand Down Expand Up @@ -83,11 +83,11 @@ DDLogLevelAll = NSUIntegerMax

#ifdef DEBUG

#define DDLogVerbose if (ddLogLevel & DDLogFlagVerbose) NSLog
#define DDLogDebug if (ddLogLevel & DDLogFlagDebug) NSLog
#define DDLogWarn if (ddLogLevel & DDLogFlagWarning) NSLog
#define DDLogInfo if (ddLogLevel & DDLogFlagInfo) NSLog
#define DDLogError if (ddLogLevel & DDLogFlagError) NSLog
#define DDLogVerbose if (MQTTLogLevel & DDLogFlagVerbose) NSLog
#define DDLogDebug if (MQTTLogLevel & DDLogFlagDebug) NSLog
#define DDLogWarn if (MQTTLogLevel & DDLogFlagWarning) NSLog
#define DDLogInfo if (MQTTLogLevel & DDLogFlagInfo) NSLog
#define DDLogError if (MQTTLogLevel & DDLogFlagError) NSLog

#else

Expand All @@ -100,7 +100,7 @@ DDLogLevelAll = NSUIntegerMax
#endif /* DEBUG */
#endif /* LUMBERJACK */

extern DDLogLevel ddLogLevel;
extern DDLogLevel MQTTLogLevel;

/** MQTTLog lets you define the log level for MQTTClient
* independently of using CocoaLumberjack
Expand Down
6 changes: 3 additions & 3 deletions MQTTClient/MQTTClient/MQTTLog.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ @implementation MQTTLog

#ifdef DEBUG

DDLogLevel ddLogLevel = DDLogLevelVerbose;
DDLogLevel MQTTLogLevel = DDLogLevelVerbose;

#else

DDLogLevel ddLogLevel = DDLogLevelWarning;
DDLogLevel MQTTLogLevel = DDLogLevelWarning;

#endif

+ (void)setLogLevel:(DDLogLevel)logLevel {
ddLogLevel = logLevel;
MQTTLogLevel = logLevel;
}

@end