From d5efb15acac8728d48f521000fa3bb30e2b5364a Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Sat, 29 Jun 2024 11:05:29 -0700
Subject: [PATCH] Log updates

---
 Meshtastic/Helpers/BLEManager.swift         | 2 +-
 Meshtastic/Helpers/MeshPackets.swift        | 5 +++--
 Meshtastic/Persistence/Persistence.swift    | 6 +++---
 Meshtastic/Views/Settings/AppLog.swift      | 4 ++--
 Meshtastic/Views/Settings/AppSettings.swift | 6 +++---
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift
index e9fce916..8fddb80a 100644
--- a/Meshtastic/Helpers/BLEManager.swift
+++ b/Meshtastic/Helpers/BLEManager.swift
@@ -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
diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift
index 452d435d..2043b968 100644
--- a/Meshtastic/Helpers/MeshPackets.swift
+++ b/Meshtastic/Helpers/MeshPackets.swift
@@ -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
 				// ------------------------
diff --git a/Meshtastic/Persistence/Persistence.swift b/Meshtastic/Persistence/Persistence.swift
index b00f00a9..25f9a3e2 100644
--- a/Meshtastic/Persistence/Persistence.swift
+++ b/Meshtastic/Persistence/Persistence.swift
@@ -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)")
 			}
 		}
diff --git a/Meshtastic/Views/Settings/AppLog.swift b/Meshtastic/Views/Settings/AppLog.swift
index 975a302e..9e3a80a0 100644
--- a/Meshtastic/Views/Settings/AppLog.swift
+++ b/Meshtastic/Views/Settings/AppLog.swift
@@ -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)
diff --git a/Meshtastic/Views/Settings/AppSettings.swift b/Meshtastic/Views/Settings/AppSettings.swift
index c8bbf301..c840b8c1 100644
--- a/Meshtastic/Views/Settings/AppSettings.swift
+++ b/Meshtastic/Views/Settings/AppSettings.swift
@@ -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)