diff --git a/Importer/Importers/Importer.cs b/Importer/Importers/Importer.cs index 616cfd5..40f8d12 100644 --- 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 index 40d1c1b..8e674ca 100644 --- 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 GetDksrData() { - var response = - await Client.GetAsync( - Endpoints.GetAuthenticatedEndpointUrl(Username, Password, Endpoints.ParkingLotEndpoint)); - var result = await response.Content.ReadAsAsync(); - return result; + try + { + var response = + await Client.GetAsync( + Endpoints.GetAuthenticatedEndpointUrl(Username, Password, Endpoints.ParkingLotEndpoint)); + var result = await response.Content.ReadAsAsync(); + return result; + } + catch (Exception e) + { + Logger.LogError("Getting data from DKSR failed, returning empty response"); + throw new Exception($"{DateTime.Now} - {e}"); + } } } \ No newline at end of file diff --git a/Importer/Importers/TreeImporter.cs b/Importer/Importers/TreeImporter.cs index 4c26aa4..3add8d9 100644 --- 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 GetDksrData() { - var response = - await Client.GetAsync( - Endpoints.GetAuthenticatedEndpointUrl(Username, Password, Endpoints.TreesenseEndpoint)); - var result = await response.Content.ReadAsAsync(); - return result; + try + { + var response = + await Client.GetAsync( + Endpoints.GetAuthenticatedEndpointUrl(Username, Password, Endpoints.TreesenseEndpoint)); + var result = await response.Content.ReadAsAsync(); + return result; + } + catch (Exception e) + { + Logger.LogError("Getting data from DKSR failed, returning empty response"); + throw new Exception($"{DateTime.Now} - {e}"); + } } } \ No newline at end of file