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

Jump to bottom

Update logger #372

Merged
merged 2 commits into from
Aug 1, 2023
Merged

Update logger #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5bdb22
Update logger
uhooi Aug 1, 2023
8ec7273
Refactor logger
uhooi Aug 1, 2023
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
2 changes: 1 addition & 1 deletion Sources/AppModule/Repository/Spotlight/SpotlightRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ extension SpotlightClient: SpotlightRepository {
try await searchableIndex.indexSearchableItems([item])
} catch {
// No need for error handling, as there is no need to give the user feedback on save failures for Spotlight search.
logger.exception(error, file: #file, function: #function, line: #line, column: #column)
logger.exception(error)
return
}
}
Expand Down
82 changes: 33 additions & 49 deletions Sources/Logger/Logger.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,32 @@ public protocol LoggerProtocol {
func exception(_ error: Error, file: String, function: String, line: Int, column: Int)
}

extension LoggerProtocol { // swiftlint:disable:this file_types_order
public func debug(_ message: String, file: String = #file, function: String = #function, line: Int = #line, column: Int = #column) {
debug(message, file: file, function: function, line: line, column: column)
}

public func info(_ message: String, file: String = #file, function: String = #function, line: Int = #line, column: Int = #column) {
info(message, file: file, function: function, line: line, column: column)
}

public func notice(_ message: String, file: String = #file, function: String = #function, line: Int = #line, column: Int = #column) {
notice(message, file: file, function: function, line: line, column: column)
}

public func error(_ message: String, file: String = #file, function: String = #function, line: Int = #line, column: Int = #column) {
error(message, file: file, function: function, line: line, column: column)
}

public func fault(_ message: String, file: String = #file, function: String = #function, line: Int = #line, column: Int = #column) {
fault(message, file: file, function: function, line: line, column: column)
}

public func exception(_ error: Error, file: String = #file, function: String = #function, line: Int = #line, column: Int = #column) {
exception(error, file: file, function: function, line: line, column: column)
}
}

public final class Logger {

// MARK: Stored Type Properties
Expand All @@ -43,80 +69,38 @@ public final class Logger {
}

extension Logger: LoggerProtocol {
public func debug(
_ message: String,
file: String = #file,
function: String = #function,
line: Int = #line,
column: Int = #column
) {
public func debug(_ message: String, file: String, function: String, line: Int, column: Int) {
let logRow = logRow(message, file: file, function: function, line: line, column: column)
logger.debug("\(logRow, privacy: .public)")
}

public func info(
_ message: String,
file: String = #file,
function: String = #function,
line: Int = #line,
column: Int = #column
) {
public func info(_ message: String, file: String, function: String, line: Int, column: Int) {
let logRow = logRow(message, file: file, function: function, line: line, column: column)
logger.info("\(logRow, privacy: .public)")
}

public func notice(
_ message: String,
file: String = #file,
function: String = #function,
line: Int = #line,
column: Int = #column
) {
public func notice(_ message: String, file: String, function: String, line: Int, column: Int) {
let logRow = logRow(message, file: file, function: function, line: line, column: column)
logger.notice("\(logRow, privacy: .public)")
}

public func error(
_ message: String,
file: String = #file,
function: String = #function,
line: Int = #line,
column: Int = #column
) {
public func error(_ message: String, file: String, function: String, line: Int, column: Int) {
let logRow = logRow(message, file: file, function: function, line: line, column: column)
logger.error("\(logRow, privacy: .public)")
}

public func fault(
_ message: String,
file: String = #file,
function: String = #function,
line: Int = #line,
column: Int = #column
) {
public func fault(_ message: String, file: String, function: String, line: Int, column: Int) {
let logRow = logRow(message, file: file, function: function, line: line, column: column)
logger.fault("\(logRow, privacy: .public)")
}

public func exception(
_ error: Error,
file: String = #file,
function: String = #function,
line: Int = #line,
column: Int = #column
) {
public func exception(_ error: Error, file: String, function: String, line: Int, column: Int) {
self.error(error.localizedDescription, file: file, function: function, line: line, column: column)
}

// MARK: Other Private Methods

private func logRow(
_ message: String,
file: String,
function: String,
line: Int,
column: Int
) -> String {
private func logRow(_ message: String, file: String, function: String, line: Int, column: Int) -> String {
"\(file) \(function) (Line: \(line), Column: \(column)): \(message)"
}
}
2 changes: 1 addition & 1 deletion Sources/MonsterWidgets/MonsterWidget.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ extension MonsterProvider: TimelineProvider {
hourOffset += 1
}
} catch {
logger.exception(error, file: #file, function: #function, line: #line, column: #column)
logger.exception(error)
}
completion(Timeline(entries: entries, policy: .atEnd))
}
Expand Down
Loading