meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Log updates

Browse source
This commit is contained in:
Garth Vander Houwen 2024-06-29 11:05:29 -07:00
parent 509037c102
commit d5efb15aca
5 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Meshtastic/Helpers/BLEManager.swift
View file

@ -1633,7 +1633,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, MqttClientProxyManagerDelegate
} catch {
context!.rollback()
let nsError = error as NSError
Logger.data.error("Error deleting node from core data: \(nsError)")
Logger.data.error("🚫 Error deleting node from core data: \(nsError)")
}
}
return false

5
Meshtastic/Helpers/MeshPackets.swift
View file

@ -681,17 +681,18 @@ func telemetryPacket(packet: MeshPacket, connectedNode: Int64, context: NSManage
telemetry.snr = packet.rxSnr
telemetry.rssi = packet.rxRssi
telemetry.time = Date(timeIntervalSince1970: TimeInterval(Int64(telemetryMessage.time)))
guard let mutableTelemetries = fetchedNode[0].telemetries!.mutableCopy() as? NSMutableOrderedSet else {
return
}
mutableTelemetries.add(telemetry)
fetchedNode[0].lastHeard = telemetry.time
fetchedNode[0].lastHeard = Date(timeIntervalSince1970: TimeInterval(Int64(packet.rxTime)))
fetchedNode[0].telemetries = mutableTelemetries.copy() as? NSOrderedSet
}
try context.save()
// Only log telemetry from the mesh not the connected device
if connectedNode != Int64(packet.from) {
Logger.data.info("💾 [Telemetry] Saved for Node: \(packet.from.toHex())")
Logger.data.info("💾 [TelemetryEntity] Saved for Node: \(packet.from.toHex())")
} else if telemetry.metricsType == 0 {
// Connected Device Metrics
// ------------------------

6
Meshtastic/Persistence/Persistence.swift
View file

@ -244,13 +244,13 @@ extension NSPersistentContainer {
do {
try FileManager.default.removeItem(at: directory.appendingPathComponent("Meshtastic.sqlite-shm"))
} catch {
Logger.services.error("Error Deleting Meshtastic.sqlite-shm file \(error, privacy: .public)")
Logger.services.error("🗄 Error Deleting Meshtastic.sqlite-shm file \(error, privacy: .public)")
}
} catch {
Logger.services.error("Error Deleting Meshtastic.sqlite-wal file \(error, privacy: .public)")
Logger.services.error("🗄 Error Deleting Meshtastic.sqlite-wal file \(error, privacy: .public)")
}
} catch {
Logger.services.error("Error Deleting Meshtastic.sqlite file \(error, privacy: .public)")
Logger.services.error("🗄 Error Deleting Meshtastic.sqlite file \(error, privacy: .public)")
throw CopyPersistentStoreErrors.copyStoreError("\(error.localizedDescription)")
}
}

4
Meshtastic/Views/Settings/AppLog.swift
View file

@ -44,9 +44,9 @@ struct AppLog: View {
Text(value.level.description)
.foregroundStyle(value.level.color)
}
.width(min: 75, max: 100)
.width(min: 85, max: 110)
TableColumn("log.category", value: \.category)
.width(min: 125, max: 150)
.width(min: 80, max: 130)
}
TableColumn("log.message", value: \.composedMessage) { value in
Text(value.composedMessage)

6
Meshtastic/Views/Settings/AppSettings.swift
View file

@ -87,13 +87,13 @@ struct AppSettings: View {
do {
try FileManager.default.removeItem(at: url.appendingPathComponent("Meshtastic.sqlite-shm"))
} catch {
Logger.services.error("Error Deleting Meshtastic.sqlite-shm file \(error, privacy: .public)")
Logger.services.error("🗄 Error Deleting Meshtastic.sqlite-shm file \(error, privacy: .public)")
}
} catch {
Logger.services.error("Error Deleting Meshtastic.sqlite-wal file \(error, privacy: .public)")
Logger.services.error("🗄 Error Deleting Meshtastic.sqlite-wal file \(error, privacy: .public)")
}
} catch {
Logger.services.error("Error Deleting Meshtastic.sqlite file \(error, privacy: .public)")
Logger.services.error("🗄 Error Deleting Meshtastic.sqlite file \(error, privacy: .public)")
}
}
clearCoreDataDatabase(context: context, includeRoutes: true)