这是indexloc提供的服务，不要输入任何密码
Skip to content

fix: FileManager log info when path doesn't exist #3594

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

Merged
merged 1 commit into from
Jan 31, 2024
Merged

fix: FileManager log info when path doesn't exist #3594

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- Clarify FramesTracker log message (#3570)
- Fix rare battery breadcrumbs crash (#3582)
- Fix synchronization issue in FramesTracker (#3571)
- Fix FileManager logs info instead of error when a path doesn't exist (#3594)

## 8.19.0

Expand Down
9 changes: 7 additions & 2 deletions Sources/Sentry/SentryFileManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,16 @@ - (void)deleteAllEnvelopes
- (NSArray<NSString *> *)allFilesInFolder:(NSString *)path
{
NSFileManager *fileManager = [NSFileManager defaultManager];
if (![fileManager fileExistsAtPath:path]) {
SENTRY_LOG_INFO(@"Returning empty files list, as folder doesn't exist at path: %@", path);
return @[];
}

NSError *error = nil;
NSArray<NSString *> *storedFiles = [fileManager contentsOfDirectoryAtPath:path error:&error];
if (nil != error) {
if (error != nil) {
SENTRY_LOG_ERROR(@"Couldn't load files in folder %@: %@", path, error);
return [NSArray new];
return @[];
}
return [storedFiles sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)];
}
Expand Down
17 changes: 17 additions & 0 deletions Tests/SentryTests/Helper/SentryFileManagerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Nimble
import Sentry
import SentryTestUtils
import XCTest
Expand Down Expand Up @@ -478,6 +479,22 @@ class SentryFileManagerTests: XCTestCase {
XCTAssertEqual(0, sut.getAllEnvelopes().count)
}

func testGetAllEnvelopesWhenNoEnvelopesPath_LogsInfoMessage() {
let logOutput = TestLogOutput()
SentryLog.setLogOutput(logOutput)
SentryLog.configure(true, diagnosticLevel: .debug)

sut.deleteAllFolders()
sut.getAllEnvelopes()

let debugLogMessages = logOutput.loggedMessages.filter { $0.contains("[Sentry] [info]") && $0.contains("Returning empty files list, as folder doesn't exist at path:") }
expect(debugLogMessages.count) == 1

let errorMessages = logOutput.loggedMessages.filter { $0.contains("[Sentry] [error]") }

expect(errorMessages.count) == 0
}

func testReadStoreDeleteAppState() {
sut.store(TestData.appState)

Expand Down