-
Notifications
You must be signed in to change notification settings - Fork 25
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.
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
Log history #597
Merged
Merged
Log history #597
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,23 +43,54 @@ - (NSString *)toString { | |
return [NSString stringWithFormat:@"%s: %@", logLevelName(self.level), self.message]; | ||
} | ||
|
||
- (NSString *)description { | ||
return [self toString]; | ||
} | ||
|
||
#pragma mark - NSCoding | ||
|
||
- (id)initWithCoder:(NSCoder *)decoder { | ||
self = [super init]; | ||
if (!self) { | ||
return nil; | ||
} | ||
_date = [decoder decodeObjectForKey:@"date"]; | ||
_level = [[decoder decodeObjectForKey:@"level"] unsignedIntValue]; | ||
_message = [decoder decodeObjectForKey:@"message"]; | ||
return self; | ||
} | ||
|
||
- (void)encodeWithCoder:(NSCoder *)encoder { | ||
[encoder encodeObject:self.date forKey:@"date"]; | ||
[encoder encodeObject:[NSNumber numberWithUnsignedInteger:self.level] forKey:@"level"]; | ||
[encoder encodeObject:self.message forKey:@"message"]; | ||
} | ||
|
||
@end | ||
|
||
@implementation ARTLog { | ||
NSMutableArray *_captured; | ||
NSMutableArray<ARTLogLine *> *_captured; | ||
NSMutableArray<ARTLogLine *> *_history; | ||
NSUInteger _historyLines; | ||
} | ||
|
||
- (instancetype)init { | ||
return [self initCapturingOutput:false]; | ||
return [self initCapturingOutput:true]; | ||
} | ||
|
||
- (instancetype)initCapturingOutput:(BOOL)capturing { | ||
return [self initCapturingOutput:true historyLines:10]; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 10 seems awfully low, should we bump to say 50 or 100? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done c3afa25. |
||
} | ||
|
||
- (instancetype)initCapturingOutput:(BOOL)capturing historyLines:(NSUInteger)historyLines { | ||
if (self = [super init]) { | ||
// Default | ||
self->_logLevel = ARTLogLevelWarn; | ||
if (capturing) { | ||
self->_captured = [[NSMutableArray alloc] init]; | ||
} | ||
_history = [[NSMutableArray alloc] init]; | ||
_historyLines = historyLines; | ||
} | ||
return self; | ||
} | ||
|
@@ -72,9 +103,17 @@ - (void)log:(NSString *)message level:(ARTLogLevel)level { | |
[_captured addObject:logLine]; | ||
} | ||
} | ||
[_history insertObject:logLine atIndex:0]; | ||
if (_history.count > _historyLines) { | ||
[_history removeLastObject]; | ||
} | ||
} | ||
|
||
- (NSArray<ARTLogLine *> *)history { | ||
return _history; | ||
} | ||
|
||
- (NSArray *)getCaptured { | ||
- (NSArray *)captured { | ||
if (!_captured) { | ||
[NSException raise:NSInternalInconsistencyException format:@"tried to get captured output in non-capturing instance; use initCapturingOutput:true if you want captured output."]; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is this for?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To save the object in disk with
NSUserDefaults
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If necessary. Currently, the logger does not store the history.