Skip to content

armgit / core

Public Imported from GitHub
0

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

Added API syslog category to log MQTT messages.

Michael Rademaker37461de229d0
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/EventInterceptHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/EventInterceptHandler.java
index 7cb8eb489..b19842932 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/EventInterceptHandler.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/EventInterceptHandler.java
@@ -20,7 +20,6 @@
package org.openremote.manager.mqtt;
import com.fasterxml.jackson.databind.JsonNode;
-import io.moquette.broker.subscriptions.Token;
import io.moquette.interception.AbstractInterceptHandler;
import io.moquette.interception.messages.*;
import org.keycloak.adapters.rotation.AdapterTokenVerifier;
@@ -33,14 +32,13 @@ import org.openremote.container.web.ConnectionConstants;
import org.openremote.manager.event.ClientEventService;
import org.openremote.manager.security.ManagerKeycloakIdentityProvider;
import org.openremote.model.Constants;
-import org.openremote.model.asset.Asset;
import org.openremote.model.asset.AssetEvent;
import org.openremote.model.asset.AssetFilter;
import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.attribute.AttributeRef;
import org.openremote.model.event.shared.CancelEventSubscription;
import org.openremote.model.event.shared.EventSubscription;
-import org.openremote.model.event.shared.SharedEvent;
+import org.openremote.model.syslog.SyslogCategory;
import org.openremote.model.util.TextUtil;
import org.openremote.model.value.Values;
@@ -54,10 +52,11 @@ import java.util.logging.Logger;
import static org.openremote.manager.mqtt.MqttBrokerService.*;
import static org.openremote.model.Constants.KEYCLOAK_CLIENT_ID;
+import static org.openremote.model.syslog.SyslogCategory.API;
public class EventInterceptHandler extends AbstractInterceptHandler {
- private static final Logger LOG = Logger.getLogger(EventInterceptHandler.class.getName());
+ private static final Logger LOG = SyslogCategory.getLogger(API, EventInterceptHandler.class);
protected final ManagerKeycloakIdentityProvider identityProvider;
protected final MessageBrokerService messageBrokerService;
@@ -219,7 +218,7 @@ public class EventInterceptHandler extends AbstractInterceptHandler {
Map<String, Object> headers = prepareHeaders(connection);
messageBrokerService.getProducerTemplate().sendBodyAndHeaders(ClientEventService.CLIENT_EVENT_QUEUE, subscription, headers);
} else {
- LOG.info("Couldn't process message for topic: " + interceptSubscribeMessage.getTopicFilter());
+ LOG.warning("Couldn't process message for topic: " + interceptSubscribeMessage.getTopicFilter());
}
} else {
LOG.info("No connection found for clientId: " + interceptSubscribeMessage.getClientID());
@@ -251,7 +250,7 @@ public class EventInterceptHandler extends AbstractInterceptHandler {
messageBrokerService.getProducerTemplate().sendBodyAndHeaders(ClientEventService.CLIENT_EVENT_QUEUE, cancelEventSubscription, headers);
}
} else {
- LOG.info("Couldn't process message for topic: " + interceptUnsubscribeMessage.getTopicFilter());
+ LOG.warning("Couldn't process message for topic: " + interceptUnsubscribeMessage.getTopicFilter());
}
} else {
LOG.info("No connection found for clientId: " + interceptUnsubscribeMessage.getClientID());
@@ -301,7 +300,7 @@ public class EventInterceptHandler extends AbstractInterceptHandler {
messageBrokerService.getProducerTemplate().sendBodyAndHeaders(ClientEventService.CLIENT_EVENT_QUEUE, attributeEvent, headers);
}
} else {
- LOG.info("Couldn't process message for topic: " + msg.getTopicName());
+ LOG.warning("Couldn't process message for topic: " + msg.getTopicName());
}
} else {
LOG.info("No connection found for clientId: " + msg.getClientID());
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthenticator.java b/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthenticator.java
index 46bf3fe9a..c697ef1d6 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthenticator.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthenticator.java
@@ -23,13 +23,16 @@ import io.moquette.broker.security.IAuthenticator;
import org.keycloak.representations.idm.ClientRepresentation;
import org.openremote.manager.security.ManagerKeycloakIdentityProvider;
import org.openremote.model.security.Tenant;
+import org.openremote.model.syslog.SyslogCategory;
import java.nio.charset.StandardCharsets;
import java.util.logging.Logger;
+import static org.openremote.model.syslog.SyslogCategory.API;
+
public class KeycloakAuthenticator implements IAuthenticator {
- private static final Logger LOG = Logger.getLogger(KeycloakAuthenticator.class.getName());
+ private static final Logger LOG = SyslogCategory.getLogger(API, KeycloakAuthenticator.class);
public static final String MQTT_CLIENT_ID_SEPARATOR = "_";
@@ -48,14 +51,14 @@ public class KeycloakAuthenticator implements IAuthenticator {
Tenant tenant = identityProvider.getTenant(realm);
if (tenant == null) {
- LOG.info("Realm not found");
+ LOG.warning("Realm not found");
return false;
}
ClientRepresentation client = identityProvider.getClient(realm, clientId);
if (client == null) {
- LOG.info("Client not found");
+ LOG.warning("Client not found");
return false;
}
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java b/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java
index 2fea815af..4a09ea311 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/KeycloakAuthorizatorPolicy.java
@@ -19,20 +19,21 @@ import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.event.shared.EventSubscription;
import org.openremote.model.event.shared.TenantFilter;
import org.openremote.model.security.ClientRole;
+import org.openremote.model.syslog.SyslogCategory;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
-import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import static org.openremote.manager.mqtt.MqttBrokerService.*;
import static org.openremote.model.Constants.KEYCLOAK_CLIENT_ID;
+import static org.openremote.model.syslog.SyslogCategory.API;
public class KeycloakAuthorizatorPolicy implements IAuthorizatorPolicy {
- private static final Logger LOG = Logger.getLogger(KeycloakAuthorizatorPolicy.class.getName());
+ private static final Logger LOG = SyslogCategory.getLogger(API, KeycloakAuthorizatorPolicy.class);
protected final ManagerKeycloakIdentityProvider identityProvider;
protected final AssetStorageService assetStorageService;
diff --git a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
index 7df817dbb..2a2e30a9d 100644
--- a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
+++ b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java
@@ -40,6 +40,7 @@ import org.openremote.model.asset.AssetEvent;
import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.event.Event;
import org.openremote.model.event.TriggeredEventSubscription;
+import org.openremote.model.syslog.SyslogCategory;
import org.openremote.model.value.Values;
import java.nio.charset.Charset;
@@ -50,11 +51,12 @@ import java.util.logging.Logger;
import static org.openremote.container.util.MapAccess.getInteger;
import static org.openremote.container.util.MapAccess.getString;
import static org.openremote.agent.protocol.ProtocolClientEventService.getSessionKey;
+import static org.openremote.model.syslog.SyslogCategory.API;
public class MqttBrokerService implements ContainerService {
public static final int PRIORITY = MED_PRIORITY;
- private static final Logger LOG = Logger.getLogger(MqttBrokerService.class.getName());
+ private static final Logger LOG = SyslogCategory.getLogger(API, MqttBrokerService.class);
public static final String MQTT_CLIENT_QUEUE = "seda://MqttClientQueue?waitForTaskToComplete=IfReplyExpected&timeout=10000&purgeWhenStopping=true&discardIfNoConsumers=false&size=25000";
public static final String MQTT_SERVER_LISTEN_HOST = "MQTT_SERVER_LISTEN_HOST";
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 bbef6c982..359f8af9b 100644
--- a/model/src/main/java/org/openremote/model/syslog/SyslogCategory.java
+++ b/model/src/main/java/org/openremote/model/syslog/SyslogCategory.java
@@ -66,6 +66,10 @@ public enum SyslogCategory {
MODEL_AND_VALUES(
"Model and Value",
true
+ ),
+ API(
+ "API",
+ true
);
protected final String categoryLabel;