Skip to content

Commit

Permalink
add custom MessageConvert
Browse files Browse the repository at this point in the history
  • Loading branch information
L1MeN9Yu committed Sep 30, 2019
1 parent 565add1 commit 90c659f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Senna/Frontend/DefaultLogger.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import Foundation

public func log(flag: LogFlag, message: CustomStringConvertible?, filename: String = #file, function: String = #function, line: Int = #line) {
let allMessage = AllMessage(message, filename, function, line).cString(using: .utf8)
let allMessage = __messageConvert(message, filename, function, line).cString(using: .utf8)
senna_default_logger_log(flag.rawValue, allMessage)
}

Expand Down
2 changes: 1 addition & 1 deletion Senna/Frontend/Logger.swift
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ extension Logger {
// MARK: - Log
extension Logger {
public func log(flag: LogFlag, message: CustomStringConvertible?, filename: String = #file, function: String = #function, line: Int = #line) {
let allMessage = AllMessage(message, filename, function, line).cString(using: .utf8)
let allMessage = __messageConvert(message, filename, function, line).cString(using: .utf8)
let loggerName = self.name.cString(using: .utf8)
let flag = UInt32(flag.rawValue)
senna_log_action(loggerName, flag, allMessage)
Expand Down
8 changes: 7 additions & 1 deletion Senna/Frontend/Senna.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,13 @@ public func drop(logger: Logger) {
senna_drop_logger(loggerName)
}

let AllMessage: (CustomStringConvertible?, String, String, Int) -> String = { message, filename, function, line in
public typealias MessageConvert = (_ message: CustomStringConvertible?, _ filename: String, _ function: String, _ line: Int) -> String

public func register(messageConvert: @escaping MessageConvert) {
__messageConvert = messageConvert
}

var __messageConvert: MessageConvert = { message, filename, function, line in
let allMessage = "[\(URL(fileURLWithPath: filename).lastPathComponent):\(line)] \(function) - \(message?.description ?? "")"
return allMessage
}
Expand Down

0 comments on commit 90c659f

Please sign in to comment.