100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Minor logging updates and removed unnecessary code from demo-basic.yml
Rich Turnerdbb8124a3a51
diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.javaindex 83ce646b8..f832293a3 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayClientService.java@@ -47,6 +47,7 @@ import org.openremote.model.gateway.GatewayConnection;import org.openremote.model.gateway.GatewayConnectionStatusEvent;import org.openremote.model.query.AssetQuery;import org.openremote.model.query.filter.TenantPredicate;+import org.openremote.model.syslog.SyslogCategory;import org.openremote.model.syslog.SyslogEvent;import java.util.*;@@ -56,13 +57,14 @@ import java.util.stream.Collectors;import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;+import static org.openremote.model.syslog.SyslogCategory.GATEWAY;/*** Handles outbound connections to central managers*/public class GatewayClientService extends RouteBuilder implements ContainerService {- private static final Logger LOG = Logger.getLogger(GatewayClientService.class.getName());+ private static final Logger LOG = SyslogCategory.getLogger(GATEWAY, GatewayClientService.class.getName());public static final String CLIENT_EVENT_SESSION_PREFIX = GatewayClientService.class.getSimpleName() + ":";protected AssetStorageService assetStorageService;protected AssetProcessingService assetProcessingService;diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.javaindex dee258a23..000f8337e 100644--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java@@ -105,7 +105,7 @@ public class GatewayService extends RouteBuilder implements ContainerService, AsexecutorService = container.getService(ManagerExecutorService.class);if (!identityService.isKeycloakEnabled()) {- LOG.warning("Gateways are not supported when not using Keycloak identity provider");+ LOG.warning("Incoming edge gateway connections disabled: Not supported when not using Keycloak identity provider");active = false;} else {active = true;diff --git a/profile/demo-basic.yml b/profile/demo-basic.ymlindex 61226a194..9ef63c32f 100644--- a/profile/demo-basic.yml+++ b/profile/demo-basic.yml@@ -42,21 +42,5 @@ services:volumes:- deployment-data:/deploymentenvironment:- # This switch can wipe all your Manager and Keycloak data! Typically you would only run the- # stack once with this switch enabled to create the initial database and optionally import- # some examples. To go into production, ensure the postgresql service's data is permanently- # stored in a volume. Then disable the force clean switch, so you can restart services without- # wiping the database. The database schemas will be upgraded to new versions of the services- # automatically, you do not have to wipe all data to install a new version of OpenRemote.- SETUP_WIPE_CLEAN_INSTALL: 'true'-- # If you force clean, a new master admin user will be created with this password.- SETUP_ADMIN_PASSWORD: secret-- # Other demo data can be imported as needed, these examples only use the simulator protocol.- SETUP_IMPORT_DEMO_USERS: 'true'- SETUP_IMPORT_DEMO_ASSETS: 'true'- SETUP_IMPORT_DEMO_RULES: 'true'-# Use basic identity service instead of Keycloak, set master admin passwordIDENTITY_PROVIDER: basic