Skip to content

armgit / core

Public Imported from GitHub
0

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

Added Logging category for data export

Michael Rademakeradf183f4304b
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
index 35b9d5cb1..293e22d2f 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java
@@ -33,6 +33,7 @@ import org.openremote.model.datapoint.DatapointInterval;
import org.openremote.model.datapoint.DatapointPeriod;
import org.openremote.model.datapoint.ValueDatapoint;
import org.openremote.model.http.RequestParams;
+import org.openremote.model.syslog.SyslogCategory;
import javax.ws.rs.BadRequestException;
import javax.ws.rs.BeanParam;
@@ -56,11 +57,13 @@ import java.util.logging.Logger;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
+import static org.openremote.model.syslog.SyslogCategory.DATA;
import static org.openremote.model.value.Values.JSON;
public class AssetDatapointResourceImpl extends ManagerWebResource implements AssetDatapointResource {
private static final Logger LOG = Logger.getLogger(AssetDatapointResourceImpl.class.getName());
+ private static final Logger DATA_EXPORT_LOG = SyslogCategory.getLogger(DATA, AssetDatapointResourceImpl.class);
protected final AssetStorageService assetStorageService;
protected final AssetDatapointService assetDatapointService;
@@ -163,7 +166,7 @@ public class AssetDatapointResourceImpl extends ManagerWebResource implements As
}
if (!isTenantActiveAndAccessible(asset.getRealm())) {
- LOG.info("Forbidden access for user '" + getUsername() + "': " + asset);
+ DATA_EXPORT_LOG.info("Forbidden access for user '" + getUsername() + "': " + asset);
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
@@ -172,6 +175,8 @@ public class AssetDatapointResourceImpl extends ManagerWebResource implements As
);
}
+ DATA_EXPORT_LOG.info("User '" + getUsername() + "' started data export for " + attributeRefsString + " from " + fromTimestamp + " to " + toTimestamp);
+
ScheduledFuture<File> exportFuture = assetDatapointService.exportDatapoints(attributeRefs, fromTimestamp, toTimestamp);
asyncResponse.register((ConnectionCallback) disconnected -> {
exportFuture.cancel(true);
@@ -200,13 +205,13 @@ public class AssetDatapointResourceImpl extends ManagerWebResource implements As
} catch (Exception ex) {
exportFuture.cancel(true);
asyncResponse.resume(new WebApplicationException(Response.Status.INTERNAL_SERVER_ERROR));
- LOG.log(Level.WARNING, "Exception in ScheduledFuture: ", ex);
+ DATA_EXPORT_LOG.log(Level.WARNING, "Exception in ScheduledFuture: ", ex);
} finally {
if (exportFile != null && exportFile.exists()) {
try {
exportFile.delete();
} catch (Exception e) {
- LOG.log(Level.WARNING, "Failed to delete temporary export file: " + exportFile.getPath(), e);
+ DATA_EXPORT_LOG.log(Level.WARNING, "Failed to delete temporary export file: " + exportFile.getPath(), e);
}
}
}
diff --git a/model/src/main/java/org/openremote/model/syslog/SyslogCategory.java b/model/src/main/java/org/openremote/model/syslog/SyslogCategory.java
index 359f8af9b..947263494 100644
--- a/model/src/main/java/org/openremote/model/syslog/SyslogCategory.java
+++ b/model/src/main/java/org/openremote/model/syslog/SyslogCategory.java
@@ -70,6 +70,10 @@ public enum SyslogCategory {
API(
"API",
true
+ ),
+ DATA(
+ "DATA",
+ true
);
protected final String categoryLabel;