update logs with timestamps

agriculturedev · Dec 21, 2023 · f70b79d · f70b79d
1 parent 6b8a44f
commit f70b79d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 17 deletions.
diff --git a/Importer/Importers/Importer.cs b/Importer/Importers/Importer.cs
@@ -33,7 +33,7 @@ protected Importer(ILogger logger, string dataType, string dataStreamName)
         DataType = dataType;
         _dataStreamName = dataStreamName;
 
-        Logger.LogInformation($"Starting {DataType} Sensor Data Collection");
+        Logger.LogInformation($"{DateTime.Now} - Starting {DataType} Sensor Data Collection");
     }
 
     protected static string? Username { get; set; }

diff --git a/Importer/Importers/ParkingLotImporter.cs b/Importer/Importers/ParkingLotImporter.cs
@@ -18,7 +18,7 @@ public ParkingLotImporter(ILogger logger) : base(logger, "ParkingLot", "Occupanc
     {
         try
         {
-            Logger.LogInformation($"Updating {DataType} Data...");
+            Logger.LogInformation($"{DateTime.Now} - Updating {DataType} Data...");
             var data = await GetDksrData();
             foreach (var dksrParkingLot in data.SensorData)
                 try
@@ -41,21 +41,29 @@ public ParkingLotImporter(ILogger logger) : base(logger, "ParkingLot", "Occupanc
                 }
                 catch (Exception e)
                 {
-                    Logger.LogError(e.ToString());
+                    Logger.LogError($"{DateTime.Now} - {e}");
                 }
         }
         catch (Exception e)
         {
-            Logger.LogError(e.ToString());
+            Logger.LogError($"{DateTime.Now} - {e}");
         }
     }
 
     private async Task<ParkingLotResponse> GetDksrData()
     {
-        var response =
-            await Client.GetAsync(
-                Endpoints.GetAuthenticatedEndpointUrl(Username, Password, Endpoints.ParkingLotEndpoint));
-        var result = await response.Content.ReadAsAsync<ParkingLotResponse>();
-        return result;
+        try
+        {
+            var response =
+                await Client.GetAsync(
+                    Endpoints.GetAuthenticatedEndpointUrl(Username, Password, Endpoints.ParkingLotEndpoint));
+            var result = await response.Content.ReadAsAsync<ParkingLotResponse>();
+            return result;
+        }
+        catch (Exception e)
+        {
+            Logger.LogError("Getting data from DKSR failed, returning empty response");
+            throw new Exception($"{DateTime.Now} - {e}");
+        }
     }
 }
diff --git a/Importer/Importers/TreeImporter.cs b/Importer/Importers/TreeImporter.cs
@@ -18,7 +18,7 @@ protected override async void Import(object? _)
     {
         try
         {
-            Logger.LogInformation($"Updating {DataType} Data...");
+            Logger.LogInformation($"{DateTime.Now} - Updating {DataType} Data...");
             var data = await GetDksrData();
             foreach (var dksrTree in data.SensorData)
                 try
@@ -41,22 +41,30 @@ protected override async void Import(object? _)
                 }
                 catch (Exception e)
                 {
-                    Logger.LogError(e.ToString());
+                    Logger.LogError($"{DateTime.Now} - {e}");
                 }
         }
         catch (Exception e)
         {
-            Logger.LogError(e.ToString());
+            Logger.LogError($"{DateTime.Now} - {e}");
         }
     }
 
 
     private async Task<TreesenseResponse> GetDksrData()
     {
-        var response =
-            await Client.GetAsync(
-                Endpoints.GetAuthenticatedEndpointUrl(Username, Password, Endpoints.TreesenseEndpoint));
-        var result = await response.Content.ReadAsAsync<TreesenseResponse>();
-        return result;
+        try
+        {
+            var response =
+                await Client.GetAsync(
+                    Endpoints.GetAuthenticatedEndpointUrl(Username, Password, Endpoints.TreesenseEndpoint));
+            var result = await response.Content.ReadAsAsync<TreesenseResponse>();
+            return result;
+        }
+        catch (Exception e)
+        {
+            Logger.LogError("Getting data from DKSR failed, returning empty response");
+            throw new Exception($"{DateTime.Now} - {e}");
+        }
     }
 }