From a4c1e724bf89b55407c343812f79eb46ed8dfc56 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 2 Mar 2023 10:55:31 +0100 Subject: [PATCH] NSCv3: improve error logging --- .../plugins/sync/nsclientV3/NSClientV3Plugin.kt | 11 ++++++----- .../plugins/sync/nsclientV3/workers/DataSyncWorker.kt | 5 ++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt index 19fe7f2266..6c6cc9ce99 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt @@ -616,7 +616,7 @@ class NSClientV3Plugin @Inject constructor( 404 -> rxBus.send(EventNSClientNewLog("◄ NOT_FOUND", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}")) else -> { - rxBus.send(EventNSClientNewLog("◄ ERROR", "ProfileStore")) + rxBus.send(EventNSClientNewLog("◄ ERROR", "${result.errorResponse}")) return true } } @@ -640,7 +640,7 @@ class NSClientV3Plugin @Inject constructor( 404 -> rxBus.send(EventNSClientNewLog("◄ NOT_FOUND", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}")) else -> { - rxBus.send(EventNSClientNewLog("◄ ERROR", "${dataPair.value.javaClass.simpleName} ")) + rxBus.send(EventNSClientNewLog("◄ ERROR", "${result.errorResponse} ")) return true } } @@ -684,7 +684,7 @@ class NSClientV3Plugin @Inject constructor( 404 -> rxBus.send(EventNSClientNewLog("◄ NOT_FOUND", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}")) else -> { - rxBus.send(EventNSClientNewLog("◄ ERROR", "${dataPair.value.javaClass.simpleName} ")) + rxBus.send(EventNSClientNewLog("◄ ERROR", "${result.errorResponse} ")) return true } } @@ -729,7 +729,7 @@ class NSClientV3Plugin @Inject constructor( 404 -> rxBus.send(EventNSClientNewLog("◄ NOT_FOUND", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}")) else -> { - rxBus.send(EventNSClientNewLog("◄ ERROR", "${dataPair.value.javaClass.simpleName} ")) + rxBus.send(EventNSClientNewLog("◄ ERROR", "${result.errorResponse} ")) return true } } @@ -795,7 +795,7 @@ class NSClientV3Plugin @Inject constructor( 404 -> rxBus.send(EventNSClientNewLog("◄ NOT_FOUND", "${dataPair.value.javaClass.simpleName} ${result.errorResponse}")) else -> { - rxBus.send(EventNSClientNewLog("◄ ERROR", "${dataPair.value.javaClass.simpleName} ")) + rxBus.send(EventNSClientNewLog("◄ ERROR", "${result.errorResponse} ")) return true } } @@ -859,6 +859,7 @@ class NSClientV3Plugin @Inject constructor( slowDown() } } catch (e: Exception) { + rxBus.send(EventNSClientNewLog("◄ ERROR", e.localizedMessage)) aapsLogger.error(LTag.NSCLIENT, "Upload exception", e) return false } diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt index c9c35d47cd..7b8442fc46 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt @@ -28,7 +28,10 @@ class DataSyncWorker( dataSyncSelectorV3.doUpload() rxBus.send(EventNSClientNewLog("► UPL", "End")) } else { - rxBus.send(EventNSClientNewLog("► ERROR", "Not connected or write permission")) + if (activePlugin.activeNsClient?.hasWritePermission == true) + rxBus.send(EventNSClientNewLog("► ERROR", "No write permission")) + else if (nsClientV3Plugin.wsConnected) + rxBus.send(EventNSClientNewLog("► ERROR", "Not connected")) // refresh token nsClientV3Plugin.scheduleIrregularExecution(refreshToken = true) }