Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Better logging when request goes wrong

Michael Rademakerca13d0300c7f
diff --git a/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java b/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java
index a724ecaa4..c4fbd3223 100644
--- a/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java
+++ b/manager/src/main/java/org/openremote/manager/energy/ForecastSolarService.java
@@ -21,6 +21,7 @@ import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.geo.GeoJSONPoint;
import org.openremote.model.query.AssetQuery;
import org.openremote.model.syslog.SyslogCategory;
+import org.openremote.model.util.TextUtil;
import javax.ws.rs.core.Response;
import java.io.IOException;
@@ -277,7 +278,15 @@ public class ForecastSolarService extends RouteBuilder implements ContainerServi
rulesService.fireDeploymentsWithPredictedDataForAsset(electricityProducerSolarAsset.getId());
}
} else {
- LOG.warning("Request failed: " + response);
+ StringBuilder message = new StringBuilder("Unknown");
+ if (response != null) {
+ message.setLength(0);
+ message.append("Status ");
+ message.append(response.getStatus());
+ message.append(" - ");
+ message.append(response.readEntity(String.class));
+ }
+ LOG.warning("Request failed: " + message);
}
} catch (Throwable e) {
if (e.getCause() != null && e.getCause() instanceof IOException) {
diff --git a/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java b/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java
index 56bb77c7c..7713aecbf 100644
--- a/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java
+++ b/manager/src/main/java/org/openremote/manager/energy/ForecastWindService.java
@@ -303,7 +303,15 @@ public class ForecastWindService extends RouteBuilder implements ContainerServic
rulesService.fireDeploymentsWithPredictedDataForAsset(electricityProducerWindAsset.getId());
} else {
- LOG.warning("Request failed: " + response);
+ StringBuilder message = new StringBuilder("Unknown");
+ if (response != null) {
+ message.setLength(0);
+ message.append("Status ");
+ message.append(response.getStatus());
+ message.append(" - ");
+ message.append(response.readEntity(String.class));
+ }
+ LOG.warning("Request failed: " + message);
}
} catch (Throwable e) {
if (e.getCause() != null && e.getCause() instanceof IOException) {