Skip to content

armgit / core

Public Imported from GitHub
0

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

Logging and JPA updates

Rich Turnerf2d142edd84e
diff --git a/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java
index 1b9ba4d7a..898161b8a 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/AbstractProtocol.java
@@ -305,7 +305,7 @@ public abstract class AbstractProtocol implements Protocol {
dynamicAttributes.contains(attributeRef));
if (ignoreAndConverted.key) {
- LOG.info("Value conversion returned ignore so attribute will not write to protocol: " + attribute.getReferenceOrThrow());
+ LOG.fine("Value conversion returned ignore so attribute will not write to protocol: " + attribute.getReferenceOrThrow());
return;
}
@@ -355,7 +355,7 @@ public abstract class AbstractProtocol implements Protocol {
Pair<Boolean, Value> ignoreAndConverted = Protocol.doInboundValueProcessing(attribute, state.getValue().orElse(null), assetService);
if (ignoreAndConverted.key) {
- LOG.info("Value conversion returned ignore so attribute will not be updated: " + attribute.getReferenceOrThrow());
+ LOG.fine("Value conversion returned ignore so attribute will not be updated: " + attribute.getReferenceOrThrow());
return;
}
diff --git a/deployment/manager/logging.properties b/deployment/manager/logging.properties
index e8f6aed47..98eed4fc8 100644
--- a/deployment/manager/logging.properties
+++ b/deployment/manager/logging.properties
@@ -109,3 +109,4 @@ org.xnio.level=WARNING
org.apache.camel.management.level=WARNING
org.apache.camel.impl.converter.DefaultTypeConverter.level=WARNING
org.apache.camel.impl.DefaultShutdownStrategy.level=SEVERE
+org.apache.http.client.protocol.level=SEVERE
\ No newline at end of file
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
index ba8e680ce..47493b59e 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
@@ -447,7 +447,10 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer
Asset asset,
AssetAttribute attribute,
Source source) throws AssetProcessingException {
- LOG.fine(">>> Processing start: " + attribute);
+
+ String attributeStr = attribute.toString();
+
+ LOG.fine(">>> Processing start: " + attributeStr);
// Need to record time here otherwise an infinite loop generated inside one of the processors means the timestamp
// is not updated so tests can't then detect the problem.
@@ -455,7 +458,7 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer
boolean complete = false;
for (AssetUpdateProcessor processor : processors) {
- LOG.finest("==> Processor " + processor + " accepts: " + attribute);
+ LOG.finest("==> Processor " + processor + " accepts: " + attributeStr);
try {
complete = processor.processAssetUpdate(em, asset, attribute, source);
} catch (AssetProcessingException ex) {
@@ -468,20 +471,20 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer
);
}
if (complete) {
- LOG.finest("<== Processor " + processor + " completely consumed: " + attribute);
+ LOG.fine("<== Processor " + processor + " completely consumed: " + attributeStr);
break;
} else {
- LOG.finest("<== Processor " + processor + " done with: " + attribute);
+ LOG.finest("<== Processor " + processor + " done with: " + attributeStr);
}
}
if (!complete) {
- LOG.finest("No processor consumed the update completely, storing: " + attribute);
+ LOG.fine("No processor consumed the update completely, storing: " + attributeStr);
storeAttributeValue(em, asset, attribute);
em.flush(); // Make sure constraint violations are immediately visible
}
- LOG.fine("<<< Processing complete: " + attribute);
+ LOG.fine("<<< Processing complete: " + attributeStr);
return complete;
}
diff --git a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java
index b7dad3baa..5f4514d2c 100644
--- a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java
+++ b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java
@@ -40,6 +40,7 @@ import java.util.*;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.atomic.AtomicLong;
import java.util.logging.Handler;
+import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
@@ -148,9 +149,17 @@ public class SyslogService extends Handler implements ContainerService {
public void publish(LogRecord record) {
SyslogEvent syslogEvent = SyslogCategory.mapSyslogEvent(record);
if (syslogEvent != null) {
- store(syslogEvent);
- if (clientEventService != null)
- clientEventService.publishEvent(syslogEvent);
+ try {
+ store(syslogEvent);
+ } catch (Exception e) {
+ LOG.log(Level.SEVERE, "Failed to store syslog event", e);
+ }
+ try {
+ if (clientEventService != null)
+ clientEventService.publishEvent(syslogEvent);
+ } catch (Exception e) {
+ LOG.log(Level.SEVERE, "Failed to send syslog event to subscribed clients", e);
+ }
}
}
@@ -272,18 +281,23 @@ public class SyslogService extends Handler implements ContainerService {
if (transientEvents.size() == 0)
return;
LOG.fine("Flushing syslog batch: " + transientEvents.size());
- persistenceService.doTransaction(em -> {
- try {
- for (SyslogEvent e : transientEvents) {
- em.persist(e);
+ try {
+ persistenceService.doTransaction(em -> {
+ try {
+ for (SyslogEvent e : transientEvents) {
+ em.persist(e);
+ }
+ } catch (RuntimeException ex) {
+ // This is not a big problem, it may happen on shutdown of database connections during tests, just inform the user
+ // TODO Or is it a serious problem and we need to escalate? In any case, just throwing the ex is not good
+ LOG.info("Error flushing syslog to database, some events are lost: " + ex);
+ } finally {
+ em.flush();
}
- em.flush();
- } catch (RuntimeException ex) {
- // This is not a big problem, it may happen on shutdown of database connections during tests, just inform the user
- // TODO Or is it a serious problem and we need to escalate? In any case, just throwing the ex is not good
- LOG.info("Error flushing syslog to database, some events are lost: " + ex);
- }
- });
+ });
+ } catch (Exception e) {
+ LOG.log(Level.SEVERE, "Exception occurred whilst flushing the syslog", e);
+ }
}
}
diff --git a/manager/src/main/resources/logging.properties b/manager/src/main/resources/logging.properties
index 7952bf17e..40653bef7 100644
--- a/manager/src/main/resources/logging.properties
+++ b/manager/src/main/resources/logging.properties
@@ -102,3 +102,4 @@ org.apache.camel.management.level=WARNING
org.apache.camel.impl.converter.DefaultTypeConverter.level=WARNING
org.apache.camel.impl.DefaultShutdownStrategy.level=SEVERE
org.jeasy.rules.level=WARNING
+org.apache.http.client.protocol.level=SEVERE
\ No newline at end of file
diff --git a/manager/src/main/resources/org/openremote/manager/setup/database/V20191202_01__Schema.sql b/manager/src/main/resources/org/openremote/manager/setup/database/V20191202_01__Schema.sql
index da37fc98a..6ea0c37bb 100644
--- a/manager/src/main/resources/org/openremote/manager/setup/database/V20191202_01__Schema.sql
+++ b/manager/src/main/resources/org/openremote/manager/setup/database/V20191202_01__Schema.sql
@@ -103,7 +103,7 @@ create table NOTIFICATION (
SOURCE varchar(50) not null,
SOURCE_ID varchar(43),
MESSAGE jsonb,
- ERROR varchar(255),
+ ERROR varchar(4096),
SENT_ON timestamp with time zone not null,
DELIVERED_ON timestamp with time zone,
ACKNOWLEDGED_ON timestamp with time zone,
diff --git a/model/src/main/java/org/openremote/model/notification/SentNotification.java b/model/src/main/java/org/openremote/model/notification/SentNotification.java
index 24c154dc4..eb11f89b3 100644
--- a/model/src/main/java/org/openremote/model/notification/SentNotification.java
+++ b/model/src/main/java/org/openremote/model/notification/SentNotification.java
@@ -66,7 +66,7 @@ public class SentNotification {
@org.hibernate.annotations.Type(type = PERSISTENCE_JSON_OBJECT_TYPE)
protected ObjectValue message;
- @Column(name = "ERROR")
+ @Column(name = "ERROR", length = 4096)
protected String error;
@Temporal(TemporalType.TIMESTAMP)
diff --git a/model/src/main/java/org/openremote/model/syslog/SyslogEvent.java b/model/src/main/java/org/openremote/model/syslog/SyslogEvent.java
index 2bbbef12e..a34c90585 100644
--- a/model/src/main/java/org/openremote/model/syslog/SyslogEvent.java
+++ b/model/src/main/java/org/openremote/model/syslog/SyslogEvent.java
@@ -102,7 +102,7 @@ public class SyslogEvent extends SharedEvent {
@Column(name = "SUBCATEGORY", length = 1024)
protected String subCategory;
- @Column(name = "MESSAGE", length = 262144)
+ @Column(name = "MESSAGE", length = 131072)
protected String message;
protected SyslogEvent() {