Skip to content

Commit b19868e

Browse files
committed
log util add define
1 parent 2914779 commit b19868e

File tree

2 files changed

+28
-7
lines changed

2 files changed

+28
-7
lines changed

QiniuSDK/Utils/QNLogUtil.h

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,20 @@
1010

1111
NS_ASSUME_NONNULL_BEGIN
1212

13+
typedef NS_ENUM(NSInteger, QNLogLevel){
14+
QNLogLevelNone,
15+
QNLogLevelError,
16+
QNLogLevelWarn,
17+
QNLogLevelInfo,
18+
QNLogLevelDebug,
19+
QNLogLevelVerbose
20+
};
21+
1322
@interface QNLogUtil : NSObject
1423

15-
+ (void)setLogLevel:(int)level;
24+
+ (void)setLogLevel:(QNLogLevel)level;
1625

17-
+ (void)log:(int)level
26+
+ (void)log:(QNLogLevel)level
1827
file:(NSString *)file
1928
function:(NSString *)function
2029
line:(NSUInteger)line
@@ -23,4 +32,12 @@ NS_ASSUME_NONNULL_BEGIN
2332

2433
@end
2534

35+
#define QNLog(level, format) [QNLogUtil log:level file:__File__ function:__func__ line:__LINE__ format:format]
36+
37+
#define QNLogError(format) QNLog(QNLogLevelError, format)
38+
#define QNLogWarn(format) QNLog(QNLogLevelWarn, format)
39+
#define QNLogInfo(format) QNLog(QNLogLevelInfo, format)
40+
#define QNLogDebug(format) QNLog(QNLogLevelDebug, format)
41+
#define QNLogVerbose(format) QNLog(QNLogLevelVerbose, format)
42+
2643
NS_ASSUME_NONNULL_END

QiniuSDK/Utils/QNLogUtil.m

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,25 @@
88

99
#import "QNLogUtil.h"
1010

11-
static int _level = 0;
11+
#if DEBUG
12+
static QNLogLevel _level = QNLogLevelVerbose;
13+
#else
14+
static QNLogLevel _level = QNLogLevelNone;
15+
#endif
1216

1317
@implementation QNLogUtil
1418

15-
+ (void)setLogLevel:(int)level{
19+
+ (void)setLogLevel:(QNLogLevel)level {
1620
_level = level < 0 ? 0 : level;
1721
}
1822

19-
+ (void)log:(int)level
23+
+ (void)log:(QNLogLevel)level
2024
file:(NSString *)file
2125
function:(NSString *)function
2226
line:(NSUInteger)line
2327
format:(NSString *)format, ... {
2428

25-
if (!format || _level < level) {
29+
if (!format || level > _level) {
2630
return;
2731
}
2832

@@ -35,7 +39,7 @@ + (void)log:(int)level
3539
NSString *levelString = @[@"V", @"D", @"I", @"W", @"E"][level%5];
3640
NSDate *date = [NSDate date];
3741
message = [NSString stringWithFormat:@"[%@]/%@ %@ %@->%@->%ld %@", levelString, date, thread.name, file, function, line, message];
38-
42+
3943
NSLog(@"%@", message);
4044
}
4145

0 commit comments

Comments
 (0)