Add admin messages category

Remove admin message log
This commit is contained in:
Garth Vander Houwen 2024-06-06 22:51:16 -07:00
parent c43cd4338d
commit 9ca99c7ed3
4 changed files with 10 additions and 15 deletions

View file

@ -17,6 +17,9 @@ extension Logger {
/// All logs related to the mesh
static let mesh = Logger(subsystem: subsystem, category: "🕸️ Mesh")
/// All admin messages
static let admin = Logger(subsystem: subsystem, category: "🏛 Admin")
/// All logs related to services such as network calls, location, etc.
static let services = Logger(subsystem: subsystem, category: "🍏 Services")
@ -29,6 +32,9 @@ extension Logger {
let store = try OSLogStore(scope: .currentProcessIdentifier)
let position = store.position(timeIntervalSinceLatestBoot: 0)
let calendar = Calendar.current
//let dayAgo = calendar.date(byAdding: .day, value: -1, to: Date.now)
//let position = store.position(date: dayAgo!)
let predicate = NSPredicate(format: predicateFormat)
let entries = try store.getEntries(at: position, matching: predicate)

View file

@ -2824,12 +2824,12 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
do {
connectedPeripheral.peripheral.writeValue(binaryData, for: TORADIO_characteristic, type: .withResponse)
try context!.save()
Logger.mesh.debug("\(adminDescription)")
Logger.admin.debug("\(adminDescription)")
return true
} catch {
context!.rollback()
let nsError = error as NSError
Logger.data.error("Error inserting new core data MessageEntity: \(nsError)")
Logger.admin.error("Error inserting new core data admin MessageEntity: \(nsError)")
}
}
return false

View file

@ -12,7 +12,7 @@ import OSLog
struct AppLog: View {
@State private var logs: [OSLogEntryLog] = []
@State private var sortOrder = [KeyPathComparator(\OSLogEntryLog.date)]
@State private var sortOrder = [KeyPathComparator(\OSLogEntryLog.date, order: .forward)]
@State private var selection: OSLogEntry.ID?
@State private var selectedLog: OSLogEntryLog?
@State private var presentingErrorDetails: Bool = false
@ -53,7 +53,7 @@ struct AppLog: View {
.width(ideal: 200, max: .infinity)
}
.searchable(text: $searchTerm, prompt: "Search")
.searchable(text: $searchTerm, placement: .navigationBarDrawer, prompt: "Search")
.disabled(selection != nil)
.overlay {
if logs.isEmpty {

View file

@ -413,17 +413,6 @@ struct Settings: View {
}
}
.tag(SettingsSidebar.meshLog)
NavigationLink {
let connectedNode = nodes.first(where: { $0.num == preferredNodeNum })
AdminMessageList(user: connectedNode?.user)
} label: {
Label {
Text("admin.log")
} icon: {
Image(systemName: "building.columns")
}
}
.tag(SettingsSidebar.adminMessageLog)
if #available (iOS 17.4, *) {
NavigationLink {
AppLog()