Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions Source/AppleLogger/Data/LoggerSetting.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@ public struct LoggerSetting {
/// A variable indicating logger paginate log or not. Because of `os_log`'s 1024 length limit.
public var isPaginateLogEnabled: Bool = false

/// A variable indicating logger use legacy log system or not.
public var isLegacyLogEnabled: Bool = false

/// A variable indicating logger use legacy log subsystem header or not.
public var isLegacyLogSubsystemEnabled: Bool = false

/// A variable indicating logger use legacy log category header or not.
public var isLegacyLogCategoryEnabled: Bool = false

/// A variable used for displaying `subsystem` value in console
public let subsystem: String

Expand Down
13 changes: 10 additions & 3 deletions Source/AppleLogger/Implement/LogService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,16 @@ extension LogService {
_ message: String,
_ printBlock: (String) -> Void
) {
let header = setting.isLegacyLogEnabled
? "[\(setting.subsystem)][\(setting.category)]\n"
: ""
let header = {
var parts: [String] = []
if setting.isLegacyLogSubsystemEnabled {
parts.append("[\(setting.subsystem)]")
}
if setting.isLegacyLogCategoryEnabled {
parts.append("[\(setting.category)]")
}
return parts.isEmpty ? "" : parts.joined() + " "
}()

guard setting.isPaginateLogEnabled, message.count > LoggerConstant.paginateSize
else {
Expand Down