zec
/
ZcashLightClientKit
mirror of https://github.com/zcash/ZcashLightClientKit.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #257 from zcash/logger-changes 

zealous-logger changes
This commit is contained in:
Francisco Gindre 2021-03-15 12:50:32 -03:00 committed by GitHub
parent 21f4f64e71 bad5c8e179
commit 39e010e830
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Example/ZcashLightClientSample/ZcashLightClientSample/SampleLogger.swift
View File

@ -19,44 +19,54 @@ class SampleLogger: ZcashLightClientKit.Logger {
case info case info
} }
enum LoggerType {
case osLog
case printerLog
}
var level: LogLevel var level: LogLevel
init(logLevel: LogLevel) { var loggerType: LoggerType
init(logLevel: LogLevel, type: LoggerType = .osLog) {
self.level = logLevel self.level = logLevel
self.loggerType = type
} }
private static let subsystem = Bundle.main.bundleIdentifier! private static let subsystem = Bundle.main.bundleIdentifier!
static let oslog = OSLog(subsystem: subsystem, category: "sample-logs") static let oslog = OSLog(subsystem: subsystem, category: "logs")
func debug(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { func debug(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
guard level.rawValue == LogLevel.debug.rawValue else { return } guard level.rawValue == LogLevel.debug.rawValue else { return }
log(level: "DEBUG 🐞", message: message, file: file, function: function, line: line) log(level: "DEBUG 🐞", message: message, file: file, function: function, line: line)
} }
func error(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { func error(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
guard level.rawValue <= LogLevel.error.rawValue else { return } guard level.rawValue <= LogLevel.error.rawValue else { return }
log(level: "ERROR 💥", message: message, file: file, function: function, line: line) log(level: "ERROR 💥", message: message, file: file, function: function, line: line)
} }
func warn(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { func warn(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
guard level.rawValue <= LogLevel.warning.rawValue else { return } guard level.rawValue <= LogLevel.warning.rawValue else { return }
log(level: "WARNING ⚠️", message: message, file: file, function: function, line: line) log(level: "WARNING ⚠️", message: message, file: file, function: function, line: line)
} }
func event(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { func event(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
guard level.rawValue <= LogLevel.event.rawValue else { return } guard level.rawValue <= LogLevel.event.rawValue else { return }
log(level: "EVENT ⏱", message: message, file: file, function: function, line: line) log(level: "EVENT ⏱", message: message, file: file, function: function, line: line)
} }
func info(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { func info(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
guard level.rawValue <= LogLevel.info.rawValue else { return } guard level.rawValue <= LogLevel.info.rawValue else { return }
log(level: "INFO ℹ️", message: message, file: file, function: function, line: line) log(level: "INFO ℹ️", message: message, file: file, function: function, line: line)
} }
private func log(level: String, message: String, file: String, function: String, line: Int) { private func log(level: String, message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
let fileName = file as NSString let fileName = (String(describing: file) as NSString).lastPathComponent
switch loggerType {
os_log("[%@] %@ - %@ - Line: %d -> %@", log: Self.oslog, type: .default, level, fileName.lastPathComponent, function, line, message) case .printerLog:
print("[\(level)] \(fileName) - \(function) - line: \(line) -> \(message)")
default:
os_log("[%{public}@] %{public}@ - %{public}@ - Line: %{public}d -> %{public}@", level, fileName, String(describing: function), line, message)
}
} }
} }

1
ZcashLightClientKit/Rust/ZcashRustBackendWelding.swift
View File

@ -54,7 +54,6 @@ public protocol ZcashRustBackendWelding {
*/ */
static func isValidExtendedFullViewingKey(_ key: String) throws -> Bool static func isValidExtendedFullViewingKey(_ key: String) throws -> Bool
/** /**
initialize the accounts table from a given seed and a number of accounts initialize the accounts table from a given seed and a number of accounts
- Parameters: - Parameters:

2
ZcashLightClientKit/Tool/DerivationTool.swift
View File

@ -236,6 +236,4 @@ extension DerivationTool: KeyValidation {
throw KeyDerivationErrors.derivationError(underlyingError: error) throw KeyDerivationErrors.derivationError(underlyingError: error)
} }
} }
} }

20
ZcashLightClientKit/Utils/LoggingProxy.swift
View File

@ -12,15 +12,15 @@ import Foundation
*/ */
public protocol Logger { public protocol Logger {
func debug(_ message: String, file: String, function: String, line: Int) func debug(_ message: String, file: StaticString, function: StaticString, line: Int)
func info(_ message: String, file: String, function: String, line: Int) func info(_ message: String, file: StaticString, function: StaticString, line: Int)
func event(_ message: String, file: String, function: String, line: Int) func event(_ message: String, file: StaticString, function: StaticString, line: Int)
func warn(_ message: String, file: String, function: String, line: Int) func warn(_ message: String, file: StaticString, function: StaticString, line: Int)
func error(_ message: String, file: String, function: String, line: Int) func error(_ message: String, file: StaticString, function: StaticString, line: Int)
} }
@ -28,23 +28,23 @@ var logger: Logger?
class LoggerProxy { class LoggerProxy {
static func debug(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { static func debug(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
logger?.debug(message, file: file, function: function, line: line) logger?.debug(message, file: file, function: function, line: line)
} }
static func info(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { static func info(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
logger?.info(message, file: file, function: function, line: line) logger?.info(message, file: file, function: function, line: line)
} }
static func event(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { static func event(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
logger?.event(message, file: file, function: function, line: line) logger?.event(message, file: file, function: function, line: line)
} }
static func warn(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { static func warn(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
logger?.warn(message, file: file, function: function, line: line) logger?.warn(message, file: file, function: function, line: line)
} }
static func error(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { static func error(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
logger?.error(message, file: file, function: function, line: line) logger?.error(message, file: file, function: function, line: line)
} }