Skip to content

armgit / core

Public Imported from GitHub
0

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

Fix asset lock IllegalMonitorStateException (#1813)

Rich Turner15615fb2758a
diff --git a/balena/manager.Dockerfile b/balena/manager.Dockerfile
index 3b4742b75..25d938fa9 100644
--- a/balena/manager.Dockerfile
+++ b/balena/manager.Dockerfile
@@ -66,6 +66,7 @@ ENV OR_JAVA_OPTS ${OR_JAVA_OPTS:--Xms500m -Xmx2g \
ENV PROMETHEUS_DISABLE_CREATED_SERIES ${PROMETHEUS_DISABLE_CREATED_SERIES:-true}
RUN mkdir -p /deployment/manager/extensions
+RUN mkdir -p /storage/logs
WORKDIR /opt/app
ADD ./balena-deployment/image /deployment
diff --git a/container/src/main/java/org/openremote/container/util/NoTimeLogFormatter.java b/container/src/main/java/org/openremote/container/util/NoTimeLogFormatter.java
new file mode 100644
index 000000000..5bdbd269b
--- /dev/null
+++ b/container/src/main/java/org/openremote/container/util/NoTimeLogFormatter.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2025, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.container.util;
+
+import org.openremote.model.util.TextUtil;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.logging.Formatter;
+import java.util.logging.LogRecord;
+
+/**
+ * A simple log formatter that doesn't output time (assumes time is handled by logging consumer)
+ */
+public class NoTimeLogFormatter extends Formatter {
+
+ public String format(LogRecord record) {
+ StringBuilder sb = new StringBuilder(250);
+
+ sb.append(TextUtil.pad(record.getLevel().toString(), 7));
+ sb.append(" ");
+ sb.append("[").append(
+ TextUtil.pad(Thread.currentThread().getName().replaceFirst("(.{24}).+(.{4})", "$1..$2"), 30)
+ ).append("] ");
+ sb.append(TextUtil.pad(TextUtil.truncate(record.getLoggerName(), 40, true), 40));
+ sb.append(" : ");
+ sb.append(formatMessage(record));
+
+ sb.append("\n");
+
+ Throwable throwable = record.getThrown();
+ if (throwable != null) {
+ StringWriter sink = new StringWriter();
+ throwable.printStackTrace(new PrintWriter(sink, true));
+ sb.append(sink);
+ }
+
+ return sb.toString();
+ }
+}
diff --git a/manager/Dockerfile b/manager/Dockerfile
index 69a66d03a..123aa2fcb 100644
--- a/manager/Dockerfile
+++ b/manager/Dockerfile
@@ -66,6 +66,7 @@ ENV OR_JAVA_OPTS ${OR_JAVA_OPTS:--Xms500m -Xmx2g \
ENV PROMETHEUS_DISABLE_CREATED_SERIES ${PROMETHEUS_DISABLE_CREATED_SERIES:-true}
RUN mkdir -p /deployment/manager/extensions
+RUN mkdir -p /storage/logs
WORKDIR /opt/app
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
index 36dbf00be..d0404e994 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
@@ -1171,10 +1171,6 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
}
}
- public void withAssetLock(String assetId, Runnable action) {
- withAssetLock(assetId, action);
- }
-
protected void createUserAssetLinks(EntityManager em, List<UserAssetLink> userAssets) {
em.unwrap(Session.class).doWork(connection -> {
diff --git a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java b/manager/src/main/java/org/openremote/manager/event/ClientEventService.java
index 7e5ff6e47..7ea6d53c2 100644
--- a/manager/src/main/java/org/openremote/manager/event/ClientEventService.java
+++ b/manager/src/main/java/org/openremote/manager/event/ClientEventService.java
@@ -529,7 +529,7 @@ public class ClientEventService extends RouteBuilder implements ContainerService
try {
webSocketChannel.close();
} catch (IOException e) {
- LOG.log(INFO, () -> "Failed to close websocket session: " + sessionKey);
+ LOG.log(DEBUG, () -> "Failed to close websocket session: " + sessionKey);
throw new RuntimeException(e);
}
}
diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java
index a3d298f4f..ddec0f543 100644
--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java
+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayConnector.java
@@ -481,6 +481,12 @@ public class GatewayConnector {
} else {
+ if (syncAssetIds == null) {
+ LOG.warning("Unexpected gateway initialisation message, requesting disconnect: " + this);
+ disconnect(GatewayDisconnectEvent.Reason.SYNC_ERROR);
+ return;
+ }
+
List<String> requestedAssetIds = syncAssetIds.stream().skip(syncIndex).limit(SYNC_ASSET_BATCH_SIZE).collect(Collectors.toList());
List<Asset<?>> returnedAssets = e.getAssets() == null ? Collections.emptyList() : e.getAssets();
diff --git a/manager/src/main/resources/logging-audit.properties b/manager/src/main/resources/logging-audit.properties
deleted file mode 100644
index 93880c5df..000000000
--- a/manager/src/main/resources/logging-audit.properties
+++ /dev/null
@@ -1,88 +0,0 @@
-# Log on STDOUT, filesystem and internal syslog service (monitoring in Manager UI)
-handlers=java.util.logging.ConsoleHandler, \
- org.openremote.manager.syslog.SyslogService, \
- java.util.logging.FileHandler
-
-###############################################################################
-# Console handler
-###############################################################################
-
-java.util.logging.ConsoleHandler.level=INFO
-
-# Console format, you can colorize this in IntelliJ IDEA "Run Application " console
-# with the GrepConsole plugin and after copying the configuration file of your
-# choice to ~/Library/Preferences/IntelliJ*/options/GrepConsole.xml:
-#
-# - tools/intellijTheme-Default-GrepConsole.xml
-# - tools/intellijTheme-Darcula-GrepConsole.xml
-#
-java.util.logging.ConsoleHandler.formatter=org.openremote.container.util.LogFormatter
-
-###############################################################################
-# File handler
-###############################################################################
-
-# Set to FINEST to get all enabled log categories on file handler
-java.util.logging.FileHandler.level=FINE
-
-# Output file and format
-java.util.logging.FileHandler.pattern=/deployment/openremote.log
-java.util.logging.FileHandler.formatter=org.openremote.container.util.LogFormatter
-# Rotate between 10 log files
-java.util.logging.FileHandler.count=10
-# 10 mb per file
-java.util.logging.FileHandler.limit=10000000
-# Set to false to clear log on restart
-java.util.logging.FileHandler.append=true
-
-###############################################################################
-# Categories and levels
-###############################################################################
-# The following level convention is used
-# FINE = System.Logger.Level.DEBUG - Will log processing times and audit logs
-# FINEST = System.Logger.Level.TRACE - Will log everything
-
-# The root logger category, the default for all categories not configured here
-.level=INFO
-
-# The root logger category of OpenRemote
-org.openremote.level=INFO
-
-# Processing time logging
-#org.openremote.manager.asset.AssetProcessingService.level=FINE
-#org.openremote.manager.asset.AssetStorageService.level=FINE
-#org.openremote.manager.rules.level=FINE
-
-# Audit logging
-# Set to fine to log MQTT connections
-org.openremote.manager.mqtt.level=FINE
-# Set to fine to log WS connections
-org.openremote.container.web.socket.WebsocketAdapter.level=FINE
-# Set to fine to log HTTP requests for servlet deployments
-org.openremote.container.web.RequestLogger.level=FINE
-# Set to fine to log all HTTP requests (not just deployments)
-#org.openremote.container.web.WebService.level=INFO
-
-
-
-# Third party overrides
-org.jboss.resteasy.level=WARNING
-org.keycloak.level=WARNING
-io.undertow.level=WARNING
-org.hibernate.level=WARNING
-org.hibernate.cfg.beanvalidation.TypeSafeActivator.level=SEVERE
-com.zaxxer.hikari.level=WARNING
-javax.management.level=WARNING
-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.jeasy.rules.level=WARNING
-org.apache.activemq.audit.level=WARNING
-
-# Set this to FINEST to log outgoing HTTP traffic
-#org.apache.http.level=WARNING
-#org.apache.http.client.protocol.level=SEVERE
-
-# Set to SEVERE to log invalid access tokens
-org.keycloak.adapters.BearerTokenRequestAuthenticator.level=OFF
diff --git a/manager/src/main/resources/logging-trace.properties b/manager/src/main/resources/logging-debug.properties
similarity index 85%
rename from manager/src/main/resources/logging-trace.properties
rename to manager/src/main/resources/logging-debug.properties
index 81fe2c7be..34a52bd43 100644
--- a/manager/src/main/resources/logging-trace.properties
+++ b/manager/src/main/resources/logging-debug.properties
@@ -7,7 +7,7 @@ handlers=java.util.logging.ConsoleHandler, \
# Console handler
###############################################################################
-java.util.logging.ConsoleHandler.level=INFO
+java.util.logging.ConsoleHandler.level=FINE
# Console format, you can colorize this in IntelliJ IDEA "Run Application " console
# with the GrepConsole plugin and after copying the configuration file of your
@@ -16,20 +16,20 @@ java.util.logging.ConsoleHandler.level=INFO
# - tools/intellijTheme-Default-GrepConsole.xml
# - tools/intellijTheme-Darcula-GrepConsole.xml
#
-java.util.logging.ConsoleHandler.formatter=org.openremote.container.util.LogFormatter
+# Don't output time as docker log driver adds time
+java.util.logging.ConsoleHandler.formatter=org.openremote.container.util.NoTimeLogFormatter
###############################################################################
# File handler
###############################################################################
-# Set to FINEST to get all enabled log categories on file handler
-java.util.logging.FileHandler.level=FINE
+java.util.logging.FileHandler.level=ALL
# Output file and format
-java.util.logging.FileHandler.pattern=/deployment/openremote.log
+java.util.logging.FileHandler.pattern=/storage/logs/openremote.log
java.util.logging.FileHandler.formatter=org.openremote.container.util.LogFormatter
-# Rotate between 10 log files
-java.util.logging.FileHandler.count=10
+# Rotate between 30 log files
+java.util.logging.FileHandler.count=30
# 10 mb per file
java.util.logging.FileHandler.limit=10000000
# Set to false to clear log on restart
@@ -46,7 +46,7 @@ java.util.logging.FileHandler.append=true
.level=INFO
# The root logger category of OpenRemote
-org.openremote.level=FINEST
+org.openremote.level=FINE
# Processing time logging
#org.openremote.manager.asset.AssetProcessingService.level=FINE
@@ -55,16 +55,16 @@ org.openremote.level=FINEST
# Audit logging
# Set to fine to log MQTT connections
-#org.openremote.manager.mqtt.level=FINE
+org.openremote.manager.mqtt.level=FINE
+# Debug Artemis MQTT connections
+#org.apache.activemq.artemis.core.protocol.mqtt.MQTTUtil.level=ALL
# Set to fine to log WS connections
-#org.openremote.container.web.socket.WebsocketAdapter.level=FINE
+org.openremote.manager.event.ClientEventService.level=FINE
# Set to fine to log HTTP requests for servlet deployments
#org.openremote.container.web.RequestLogger.level=FINE
# Set to fine to log all HTTP requests (not just deployments)
#org.openremote.container.web.WebService.level=INFO
-
-
# Third party overrides
org.jboss.resteasy.level=WARNING
org.keycloak.level=WARNING
diff --git a/manager/src/main/resources/logging-dev.properties b/manager/src/main/resources/logging-dev.properties
index 50e16ace9..e5dd0d375 100644
--- a/manager/src/main/resources/logging-dev.properties
+++ b/manager/src/main/resources/logging-dev.properties
@@ -6,7 +6,7 @@ handlers=java.util.logging.ConsoleHandler, \
# Console handler
###############################################################################
-java.util.logging.ConsoleHandler.level=FINEST
+java.util.logging.ConsoleHandler.level=ALL
# Console format, you can colorize this in IntelliJ IDEA "Run Application " console
# with the GrepConsole plugin and after copying the configuration file of your
@@ -29,8 +29,6 @@ java.util.logging.ConsoleHandler.formatter=org.openremote.container.util.LogForm
# The root logger category of OpenRemote
org.openremote.level=FINE
-org.openremote.agent.protocol.level=FINEST
-org.openremote.manager.mqtt.level=FINEST
# Processing time logging
#org.openremote.manager.asset.AssetProcessingService.level=FINE
@@ -40,15 +38,15 @@ org.openremote.manager.mqtt.level=FINEST
# Audit logging
# Set to fine to log MQTT connections
#org.openremote.manager.mqtt.level=FINE
+# Debug Artemis MQTT connections
+#org.apache.activemq.artemis.core.protocol.mqtt.MQTTUtil.level=ALL
# Set to fine to log WS connections
-#org.openremote.container.web.socket.WebsocketAdapter.level=FINE
+#org.openremote.manager.event.ClientEventService.level=FINE
# Set to fine to log HTTP requests for servlet deployments
#org.openremote.container.web.RequestLogger.level=FINE
# Set to fine to log all HTTP requests (not just deployments)
#org.openremote.container.web.WebService.level=INFO
-
-
# Third party overrides
org.jboss.resteasy.level=WARNING
org.keycloak.level=WARNING
@@ -63,7 +61,8 @@ org.apache.camel.impl.converter.DefaultTypeConverter.level=WARNING
org.apache.camel.impl.DefaultShutdownStrategy.level=SEVERE
org.jeasy.rules.level=WARNING
org.apache.activemq.audit.level=WARNING
-
+com.icegreen.greenmail.level=FINE
+com.icegreen.greenmail.util.LineLoggingBuffer.level=INFO
# Set this to FINEST to log outgoing HTTP traffic
#org.apache.http.level=WARNING
#org.apache.http.client.protocol.level=SEVERE
diff --git a/manager/src/main/resources/logging-timings-audit.properties b/manager/src/main/resources/logging-timings-audit.properties
deleted file mode 100644
index db5f61688..000000000
--- a/manager/src/main/resources/logging-timings-audit.properties
+++ /dev/null
@@ -1,88 +0,0 @@
-# Log on STDOUT, filesystem and internal syslog service (monitoring in Manager UI)
-handlers=java.util.logging.ConsoleHandler, \
- org.openremote.manager.syslog.SyslogService, \
- java.util.logging.FileHandler
-
-###############################################################################
-# Console handler
-###############################################################################
-
-java.util.logging.ConsoleHandler.level=INFO
-
-# Console format, you can colorize this in IntelliJ IDEA "Run Application " console
-# with the GrepConsole plugin and after copying the configuration file of your
-# choice to ~/Library/Preferences/IntelliJ*/options/GrepConsole.xml:
-#
-# - tools/intellijTheme-Default-GrepConsole.xml
-# - tools/intellijTheme-Darcula-GrepConsole.xml
-#
-java.util.logging.ConsoleHandler.formatter=org.openremote.container.util.LogFormatter
-
-###############################################################################
-# File handler
-###############################################################################
-
-# Set to FINEST to get all enabled log categories on file handler
-java.util.logging.FileHandler.level=FINE
-
-# Output file and format
-java.util.logging.FileHandler.pattern=/deployment/openremote.log
-java.util.logging.FileHandler.formatter=org.openremote.container.util.LogFormatter
-# Rotate between 10 log files
-java.util.logging.FileHandler.count=10
-# 10 mb per file
-java.util.logging.FileHandler.limit=10000000
-# Set to false to clear log on restart
-java.util.logging.FileHandler.append=true
-
-###############################################################################
-# Categories and levels
-###############################################################################
-# The following level convention is used
-# FINE = System.Logger.Level.DEBUG - Will log processing times and audit logs
-# FINEST = System.Logger.Level.TRACE - Will log everything
-
-# The root logger category, the default for all categories not configured here
-.level=INFO
-
-# The root logger category of OpenRemote
-org.openremote.level=INFO
-
-# Processing time logging
-org.openremote.manager.asset.AssetProcessingService.level=FINE
-org.openremote.manager.asset.AssetStorageService.level=FINE
-org.openremote.manager.rules.level=FINE
-
-# Audit logging
-# Set to fine to log MQTT connections
-org.openremote.manager.mqtt.level=FINE
-# Set to fine to log WS connections
-org.openremote.container.web.socket.WebsocketAdapter.level=FINE
-# Set to fine to log HTTP requests for servlet deployments
-org.openremote.container.web.RequestLogger.level=FINE
-# Set to fine to log all HTTP requests (not just deployments)
-#org.openremote.container.web.WebService.level=INFO
-
-
-
-# Third party overrides
-org.jboss.resteasy.level=WARNING
-org.keycloak.level=WARNING
-io.undertow.level=WARNING
-org.hibernate.level=WARNING
-org.hibernate.cfg.beanvalidation.TypeSafeActivator.level=SEVERE
-com.zaxxer.hikari.level=WARNING
-javax.management.level=WARNING
-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.jeasy.rules.level=WARNING
-org.apache.activemq.audit.level=WARNING
-
-# Set this to FINEST to log outgoing HTTP traffic
-#org.apache.http.level=WARNING
-#org.apache.http.client.protocol.level=SEVERE
-
-# Set to SEVERE to log invalid access tokens
-org.keycloak.adapters.BearerTokenRequestAuthenticator.level=OFF
diff --git a/manager/src/main/resources/logging-timings.properties b/manager/src/main/resources/logging-timings.properties
deleted file mode 100644
index bd8c711df..000000000
--- a/manager/src/main/resources/logging-timings.properties
+++ /dev/null
@@ -1,88 +0,0 @@
-# Log on STDOUT, filesystem and internal syslog service (monitoring in Manager UI)
-handlers=java.util.logging.ConsoleHandler, \
- org.openremote.manager.syslog.SyslogService, \
- java.util.logging.FileHandler
-
-###############################################################################
-# Console handler
-###############################################################################
-
-java.util.logging.ConsoleHandler.level=INFO
-
-# Console format, you can colorize this in IntelliJ IDEA "Run Application " console
-# with the GrepConsole plugin and after copying the configuration file of your
-# choice to ~/Library/Preferences/IntelliJ*/options/GrepConsole.xml:
-#
-# - tools/intellijTheme-Default-GrepConsole.xml
-# - tools/intellijTheme-Darcula-GrepConsole.xml
-#
-java.util.logging.ConsoleHandler.formatter=org.openremote.container.util.LogFormatter
-
-###############################################################################
-# File handler
-###############################################################################
-
-# Set to FINEST to get all enabled log categories on file handler
-java.util.logging.FileHandler.level=FINE
-
-# Output file and format
-java.util.logging.FileHandler.pattern=/deployment/openremote.log
-java.util.logging.FileHandler.formatter=org.openremote.container.util.LogFormatter
-# Rotate N log files
-java.util.logging.FileHandler.count=100
-# Size per file (bytes)
-java.util.logging.FileHandler.limit=10000000
-# Set to false to clear log on restart
-java.util.logging.FileHandler.append=true
-
-###############################################################################
-# Categories and levels
-###############################################################################
-# The following level convention is used
-# FINE = System.Logger.Level.DEBUG - Will log processing times and audit logs
-# FINEST = System.Logger.Level.TRACE - Will log everything
-
-# The root logger category, the default for all categories not configured here
-.level=INFO
-
-# The root logger category of OpenRemote
-org.openremote.level=INFO
-
-# Processing time logging
-org.openremote.manager.asset.AssetProcessingService.level=FINE
-org.openremote.manager.asset.AssetStorageService.level=FINE
-org.openremote.manager.rules.level=FINE
-
-# Audit logging
-# Set to fine to log MQTT connections
-#org.openremote.manager.mqtt.level=FINE
-# Set to fine to log WS connections
-#org.openremote.container.web.socket.WebsocketAdapter.level=FINE
-# Set to fine to log HTTP requests for servlet deployments
-#org.openremote.container.web.RequestLogger.level=FINE
-# Set to fine to log all HTTP requests (not just deployments)
-#org.openremote.container.web.WebService.level=INFO
-
-
-
-# Third party overrides
-org.jboss.resteasy.level=WARNING
-org.keycloak.level=WARNING
-io.undertow.level=WARNING
-org.hibernate.level=WARNING
-org.hibernate.cfg.beanvalidation.TypeSafeActivator.level=SEVERE
-com.zaxxer.hikari.level=WARNING
-javax.management.level=WARNING
-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.jeasy.rules.level=WARNING
-org.apache.activemq.audit.level=WARNING
-
-# Set this to FINEST to log outgoing HTTP traffic
-#org.apache.http.level=WARNING
-#org.apache.http.client.protocol.level=SEVERE
-
-# Set to SEVERE to log invalid access tokens
-org.keycloak.adapters.BearerTokenRequestAuthenticator.level=OFF
diff --git a/manager/src/main/resources/logging.properties b/manager/src/main/resources/logging.properties
index 11c5fe1fc..4a67b037f 100644
--- a/manager/src/main/resources/logging.properties
+++ b/manager/src/main/resources/logging.properties
@@ -1,7 +1,3 @@
-# A logging configuration to give traceability of where time is being spent
-# in the system for identifying potential issues - Uses a file handler to avoid
-# generating too much console handler traffic
-
# Log on STDOUT, filesystem and internal syslog service (monitoring in Manager UI)
handlers=java.util.logging.ConsoleHandler, \
org.openremote.manager.syslog.SyslogService, \
@@ -20,17 +16,17 @@ java.util.logging.ConsoleHandler.level=INFO
# - tools/intellijTheme-Default-GrepConsole.xml
# - tools/intellijTheme-Darcula-GrepConsole.xml
#
-java.util.logging.ConsoleHandler.formatter=org.openremote.container.util.LogFormatter
+# Don't output time as docker log driver adds time
+java.util.logging.ConsoleHandler.formatter=org.openremote.container.util.NoTimeLogFormatter
###############################################################################
# File handler
###############################################################################
-# Set to FINEST to get all enabled log categories on file handler
-java.util.logging.FileHandler.level=FINE
+java.util.logging.FileHandler.level=ALL
# Output file and format
-java.util.logging.FileHandler.pattern=/deployment/openremote.log
+java.util.logging.FileHandler.pattern=/storage/logs/openremote.log
java.util.logging.FileHandler.formatter=org.openremote.container.util.LogFormatter
# Rotate between 30 log files
java.util.logging.FileHandler.count=30
@@ -59,16 +55,16 @@ org.openremote.level=INFO
# Audit logging
# Set to fine to log MQTT connections
-#org.openremote.manager.mqtt.level=FINE
+org.openremote.manager.mqtt.level=FINE
+# Debug Artemis MQTT connections
+#org.apache.activemq.artemis.core.protocol.mqtt.MQTTUtil.level=ALL
# Set to fine to log WS connections
-#org.openremote.container.web.socket.WebsocketAdapter.level=FINE
+org.openremote.manager.event.ClientEventService.level=FINE
# Set to fine to log HTTP requests for servlet deployments
#org.openremote.container.web.RequestLogger.level=FINE
# Set to fine to log all HTTP requests (not just deployments)
#org.openremote.container.web.WebService.level=INFO
-
-
# Third party overrides
org.jboss.resteasy.level=WARNING
org.keycloak.level=WARNING
diff --git a/model/src/main/java/org/openremote/model/util/LockByKey.java b/model/src/main/java/org/openremote/model/util/LockByKey.java
index b0f5167e2..aad01008f 100644
--- a/model/src/main/java/org/openremote/model/util/LockByKey.java
+++ b/model/src/main/java/org/openremote/model/util/LockByKey.java
@@ -1,19 +1,21 @@
/*
* Copied from: https://github.com/eugenp/tutorials/blob/master/core-java-modules/core-java-concurrency-advanced-4/src/main/java/com/baeldung/lockbykey/LockByKey.java
+ * Altered to use a Semaphore instead of ReentrantLock to avoid issues with camel thread context switching between lock/unlock calls (see issue #1812)
*/
package org.openremote.model.util;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
public class LockByKey {
+ private static final System.Logger LOG = System.getLogger(LockByKey.class.getName());
+
private static class LockWrapper {
- private final Lock lock = new ReentrantLock();
+ private final Semaphore lock = new Semaphore(1); // Don't change to ReentrantLock as camel switches thread between try/finally blocks on route processors
private final AtomicInteger numberOfThreadsInQueue = new AtomicInteger(1);
private LockWrapper addThreadInQueue() {
@@ -27,19 +29,28 @@ public class LockByKey {
}
- private Map<String, LockWrapper> locks = new ConcurrentHashMap<>();
+ private final Map<String, LockWrapper> locks = new ConcurrentHashMap<>();
public void lock(String key) {
LockWrapper lockWrapper = locks.compute(key, (k, v) -> v == null ? new LockWrapper() : v.addThreadInQueue());
- lockWrapper.lock.lock();
+ try {
+ lockWrapper.lock.acquire();
+ LOG.log(System.Logger.Level.TRACE, () -> "Lock acquired: key=" + key);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt(); // Restore interrupted status
+ throw new RuntimeException("Interrupted while acquiring lock for key: " + key, e);
+ }
}
public void unlock(String key) {
LockWrapper lockWrapper = locks.get(key);
- lockWrapper.lock.unlock();
- if (lockWrapper.removeThreadFromQueue() == 0) {
- // NB : We pass in the specific value to remove to handle the case where another thread would queue right before the removal
- locks.remove(key, lockWrapper);
+ if (lockWrapper != null) {
+ LOG.log(System.Logger.Level.TRACE, () -> "Lock release: key=" + key);
+ lockWrapper.lock.release();
+ if (lockWrapper.removeThreadFromQueue() == 0) {
+ // NB : We pass in the specific value to remove to handle the case where another thread would queue right before the removal
+ locks.remove(key, lockWrapper);
+ }
}
}
diff --git a/profile/demo.yml b/profile/demo.yml
index 62482b108..0bfca6f91 100644
--- a/profile/demo.yml
+++ b/profile/demo.yml
@@ -76,6 +76,7 @@ services:
KEYCLOAK_ADMIN_PASSWORD: ${OR_ADMIN_PASSWORD?OR_ADMIN_PASSWORD must be set}
KC_HOSTNAME: ${OR_HOSTNAME:-localhost}
KC_HOSTNAME_PORT: ${OR_SSL_PORT:--1}
+ KC_LOG_CONSOLE_FORMAT: '%-5p [%c] (%t) %s%e%n'
<<: *awslogs
manager:
diff --git a/profile/dev-proxy.yml b/profile/dev-proxy.yml
index 0e9abfd87..12a8a29c3 100644
--- a/profile/dev-proxy.yml
+++ b/profile/dev-proxy.yml
@@ -40,6 +40,7 @@ services:
KEYCLOAK_ISSUER_BASE_URI: https://localhost/auth
KC_HOSTNAME_STRICT: false
KC_HOSTNAME:
+ KC_LOG_CONSOLE_FORMAT: '%-5p [%c] (%t) %s%e%n'
depends_on:
postgresql:
condition: service_healthy
diff --git a/profile/dev-testing.yml b/profile/dev-testing.yml
index 6134615dd..0b8f39233 100644
--- a/profile/dev-testing.yml
+++ b/profile/dev-testing.yml
@@ -23,6 +23,7 @@ services:
environment:
KC_HOSTNAME_STRICT_HTTPS: 'false'
KC_HOSTNAME_PORT: ${KC_HOSTNAME_PORT:-8080}
+ KC_LOG_CONSOLE_FORMAT: '%-5p [%c] (%t) %s%e%n'
# Prevent theme caching during dev
KEYCLOAK_START_OPTS: --spi-theme-static-max-age=-1 --spi-theme-cache-themes=false --spi-theme-cache-templates=false
diff --git a/test/build.gradle b/test/build.gradle
index a880dfd64..7c6a7d3dd 100644
--- a/test/build.gradle
+++ b/test/build.gradle
@@ -35,7 +35,7 @@ dependencies {
}
tasks.withType(Test) {
- environment("OR_LOGGING_CONFIG_FILE", "test/src/logging-test.properties")
+ environment("OR_LOGGING_CONFIG_FILE", "logging-dev.properties")
}
test {
diff --git a/test/load1/deployment1/manager/logging-load.properties b/test/load1/deployment1/manager/logging-load.properties
index 32e7f24be..a386cacc4 100644
--- a/test/load1/deployment1/manager/logging-load.properties
+++ b/test/load1/deployment1/manager/logging-load.properties
@@ -1,72 +1 @@
-# Log on STDOUT and internal syslog service (monitoring in Manager UI)
-handlers=java.util.logging.ConsoleHandler, \
- org.openremote.manager.syslog.SyslogService
-
-###############################################################################
-# Console handler
-###############################################################################
-
-java.util.logging.ConsoleHandler.level=FINEST
-
-# Console format, you can colorize this in IntelliJ IDEA "Run Application " console
-# with the GrepConsole plugin and after copying the configuration file of your
-# choice to ~/Library/Preferences/IntelliJ*/options/GrepConsole.xml:
-#
-# - tools/intellijTheme-Default-GrepConsole.xml
-# - tools/intellijTheme-Darcula-GrepConsole.xml
-#
-java.util.logging.ConsoleHandler.formatter=org.openremote.container.util.LogFormatter
-
-###############################################################################
-# Categories and levels
-###############################################################################
-# The following level convention is used
-# FINE = System.Logger.Level.DEBUG - Will log processing times and audit logs
-# FINEST = System.Logger.Level.TRACE - Will log everything
-
-# The root logger category, the default for all categories not configured here
-.level=INFO
-
-# The root logger category of OpenRemote
-org.openremote.level=INFO
-org.openremote.agent.protocol.level=FINEST
-org.openremote.manager.mqtt.level=FINEST
-
-# Processing time logging
-#org.openremote.manager.asset.AssetProcessingService.level=FINE
-#org.openremote.manager.asset.AssetStorageService.level=FINE
-org.openremote.manager.rules.level=FINE
-
-# Audit logging
-# Set to fine to log MQTT connections
-#org.openremote.manager.mqtt.level=FINE
-# Set to fine to log WS connections
-org.openremote.container.web.socket.WebsocketAdapter.level=FINE
-# Set to fine to log HTTP requests for servlet deployments
-#org.openremote.container.web.RequestLogger.level=FINE
-# Set to fine to log all HTTP requests (not just deployments)
-#org.openremote.container.web.WebService.level=INFO
-
-org.apache.activemq.artemis.core.protocol.mqtt.MQTTUtil.level=FINEST
-
-# Third party overrides
-org.jboss.resteasy.level=WARNING
-org.keycloak.level=WARNING
-io.undertow.level=WARNING
-org.hibernate.level=WARNING
-org.hibernate.cfg.beanvalidation.TypeSafeActivator.level=SEVERE
-com.zaxxer.hikari.level=WARNING
-javax.management.level=WARNING
-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.jeasy.rules.level=WARNING
-org.apache.activemq.audit.level=WARNING
-
-# Set this to FINEST to log outgoing HTTP traffic
-#org.apache.http.level=WARNING
-#org.apache.http.client.protocol.level=SEVERE
-
-# Set to SEVERE to log invalid access tokens
-org.keycloak.adapters.BearerTokenRequestAuthenticator.level=OFF
+# Put custom logging config here for load testing purposes and reference this in test-load1.yml
diff --git a/test/load1/deployment1/test-load1.yml b/test/load1/deployment1/test-load1.yml
index 3f790de11..25dbe294d 100644
--- a/test/load1/deployment1/test-load1.yml
+++ b/test/load1/deployment1/test-load1.yml
@@ -77,7 +77,7 @@ services:
environment:
OR_ADMIN_PASSWORD: ${OR_ADMIN_PASSWORD?OR_ADMIN_PASSWORD must be set}
OR_DB_POOL_MAX_SIZE: ${OR_DB_POOL_MAX_SIZE:-60}
- OR_LOGGING_CONFIG_FILE: /deployment/manager/logging-load.properties
+ # OR_LOGGING_CONFIG_FILE: /deployment/manager/logging-load.properties
OR_SETUP_RUN_ON_RESTART:
OR_EMAIL_HOST:
OR_EMAIL_USER:
diff --git a/test/src/logging-test.properties b/test/src/logging-test.properties
deleted file mode 100644
index d90612201..000000000
--- a/test/src/logging-test.properties
+++ /dev/null
@@ -1,73 +0,0 @@
-# Log on STDOUT and internal syslog service (monitoring in Manager UI)
-handlers=java.util.logging.ConsoleHandler, \
- org.openremote.manager.syslog.SyslogService
-
-###############################################################################
-# Console handler
-###############################################################################
-
-java.util.logging.ConsoleHandler.level=FINEST
-
-# Console format, you can colorize this in IntelliJ IDEA "Run Application " console
-# with the GrepConsole plugin and after copying the configuration file of your
-# choice to ~/Library/Preferences/IntelliJ*/options/GrepConsole.xml:
-#
-# - tools/intellijTheme-Default-GrepConsole.xml
-# - tools/intellijTheme-Darcula-GrepConsole.xml
-#
-java.util.logging.ConsoleHandler.formatter=org.openremote.container.util.LogFormatter
-
-###############################################################################
-# Categories and levels
-###############################################################################
-# The following level convention is used
-# FINE = System.Logger.Level.DEBUG - Will log processing times and audit logs
-# FINEST = System.Logger.Level.TRACE - Will log everything
-
-# The root logger category, the default for all categories not configured here
-.level=INFO
-
-# The root logger category of OpenRemote
-org.openremote.level=FINE
-org.openremote.manager.asset.AssetStorageService.level=INFO
-
-# Processing time logging
-#org.openremote.manager.asset.AssetProcessingService.level=FINE
-#org.openremote.manager.asset.AssetStorageService.level=FINE
-#org.openremote.manager.rules.level=FINE
-
-# Audit logging
-# Set to fine to log MQTT connections
-#org.openremote.manager.mqtt.level=FINE
-# Set to fine to log WS connections
-#org.openremote.container.web.socket.WebsocketAdapter.level=FINE
-# Set to fine to log HTTP requests for servlet deployments
-#org.openremote.container.web.RequestLogger.level=FINE
-# Set to fine to log all HTTP requests (not just deployments)
-#org.openremote.container.web.WebService.level=INFO
-
-# Try to get more info on AbstractNettyIOClient as we get strange intermittent test failures
-org.openremote.agent.protocol.level=FINEST
-
-# Third party overrides
-org.jboss.resteasy.level=WARNING
-org.keycloak.level=WARNING
-io.undertow.level=WARNING
-org.hibernate.level=WARNING
-org.hibernate.cfg.beanvalidation.TypeSafeActivator.level=SEVERE
-com.zaxxer.hikari.level=WARNING
-javax.management.level=WARNING
-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.jeasy.rules.level=WARNING
-org.apache.activemq.audit.level=WARNING
-com.icegreen.greenmail.level=FINE
-com.icegreen.greenmail.util.LineLoggingBuffer.level=INFO
-# Set this to FINEST to log outgoing HTTP traffic
-#org.apache.http.level=WARNING
-#org.apache.http.client.protocol.level=SEVERE
-
-# Set to SEVERE to log invalid access tokens
-org.keycloak.adapters.BearerTokenRequestAuthenticator.level=OFF