Using StaticString since that's more correct

WeTransfer · Dec 3, 2021 · e3ae5d2 · e3ae5d2
1 parent cd84cf7
commit e3ae5d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Sources/Logging/DiagnosticsLogger.swift b/Sources/Logging/DiagnosticsLogger.swift
@@ -61,7 +61,7 @@ public final class DiagnosticsLogger {
  /// - file: The file from which the log is send. Defaults to `#file`.
  /// - function: The functino from which the log is send. Defaults to `#function`.
  /// - line: The line from which the log is send. Defaults to `#line`.
- public static func log(message: String, file: String = #file, function: String = #function, line: UInt = #line) {
+ public static func log(message: String, file: StaticString = #file, function: StaticString = #function, line: UInt = #line) {
  standard.log(LogItem(.debug(message: message), file: file, function: function, line: line))
  }
 
@@ -72,7 +72,7 @@ public final class DiagnosticsLogger {
  /// - file: The file from which the log is send. Defaults to `#file`.
  /// - function: The functino from which the log is send. Defaults to `#function`.
  /// - line: The line from which the log is send. Defaults to `#line`.
- public static func log(error: Error, description: String? = nil, file: String = #file, function: String = #function, line: UInt = #line) {
+ public static func log(error: Error, description: String? = nil, file: StaticString = #file, function: StaticString = #function, line: UInt = #line) {
  standard.log(LogItem(.error(error: error, description: description), file: file, function: function, line: line))
  }
 }

diff --git a/Sources/Logging/Loggable.swift b/Sources/Logging/Loggable.swift
@@ -74,9 +74,9 @@ struct LogItem: Loggable {
  let message: String
  let cssClass: String?
 
- init(_ type: LogType, file: String, function: String, line: UInt) {
+ init(_ type: LogType, file: StaticString, function: StaticString, line: UInt) {
  let date = DateFormatter.current.string(from: Date())
- let file = file.split(separator: "/").last.map(String.init) ?? file
+ let file = String(describing: file).split(separator: "/").last.map(String.init) ?? String(describing: file)
  self.message = String(format: "%@ | %@:L%@ | %@", date, file, String(line), type.message)
  self.cssClass = type.cssClass
  }