Skip to content
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

Don't pass a URL as a log destination to rust #2506

Merged
merged 6 commits into from
Feb 28, 2024
Merged

Don't pass a URL as a log destination to rust #2506

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a6f615f
Don't pass a URL as a log destination to rust
ara4n Feb 27, 2024
da6affe
changelog
ara4n Feb 27, 2024
5f8018c
Merge branch 'develop' into matthew/fix-logging-on-macos
ara4n Feb 27, 2024
05a4319
Use path(percentEncoded:)
pixlwave Feb 28, 2024
ed1db4f
Whitespace.
pixlwave Feb 28, 2024
6b7a304
Merge branch 'develop' into matthew/fix-logging-on-macos
Velin92 Feb 28, 2024
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
8 changes: 6 additions & 2 deletions ElementX/Sources/Other/Logging/RustTracing.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,25 @@ enum RustTracing {
// as the app is unlikely to be running continuously.
let maxFiles: UInt64 = 24 * 7

guard let path = logsDirectory.path().removingPercentEncoding else {
return
}

if let otlpConfiguration {
setupOtlpTracing(config: .init(clientName: "ElementX-iOS",
user: otlpConfiguration.username,
password: otlpConfiguration.password,
otlpEndpoint: otlpConfiguration.url,
filter: configuration.filter,
writeToStdoutOrSystem: true,
writeToFiles: .init(path: logsDirectory.path(),
writeToFiles: .init(path: path,
pixlwave marked this conversation as resolved.
Show resolved Hide resolved
filePrefix: configuration.fileName,
fileSuffix: configuration.fileExtension,
maxFiles: maxFiles)))
} else {
setupTracing(config: .init(filter: configuration.filter,
writeToStdoutOrSystem: true,
writeToFiles: .init(path: logsDirectory.path(),
writeToFiles: .init(path: path,
filePrefix: configuration.fileName,
fileSuffix: configuration.fileExtension,
maxFiles: maxFiles)))
Expand Down
1 change: 1 addition & 0 deletions changelog.d/pr-2506.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Don't pass a URL as a log destination to rust on macOS
Loading