Merge pull request #360 from jacomago/pvaccess-disconnects

slightly nicer disconnects handling

Author: jacomago

build.gradle

@@ -134,7 +134,7 @@ dependencies {
 	testImplementation("org.junit.jupiter:junit-jupiter-api:5.2.0")
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.2.0")
 	testImplementation('org.awaitility:awaitility:4.2.0')
-	implementation("org.phoebus:core-pva:5.0.0")
+	implementation("org.phoebus:core-pva:5.0.2")
 	runtimeOnly("org.mariadb.jdbc:mariadb-java-client:3.1.4")
 }
 

src/main/org/epics/archiverappliance/engine/pv/EPICS_V4_PV.java

@@ -134,6 +134,12 @@ private void fireDisconnected() {
             listener.pvDisconnected(this);
         }
     }
+    /** Notify all listeners. */
+    private void fireConnected() {
+        for (final PVListener listener : listeners) {
+            listener.pvConnected(this);
+        }
+    }
 
     /** Notify all listeners. */
     private void fireValueUpdate(DBRTimeEvent ev) {
@@ -218,21 +224,17 @@ public void getLowLevelChannelInfo(List<Map<String, String>> statuses) {
     @Override
     public void channelStateChanged(PVAChannel channel, ClientChannelState clientChannelState) {
 
-        logger.info("channelStateChanged:" + clientChannelState + " " + channel.getName());
+        logger.info(channel.getName() + " channelStateChanged:" + clientChannelState);
         if (clientChannelState == ClientChannelState.CONNECTED) {
             this.scheduleCommand(this::handleConnected);
         } else if (connected) {
-            this.scheduleCommand(() -> {
-                state = PVConnectionState.Disconnected;
-                connected = false;
-                unsubscribe();
-                fireDisconnected();
-            });
+            this.scheduleCommand(this::handleDisconnected);
         }
     }
 
+
     private void setupDBRType(PVAStructure data) {
-        logger.info("Construct the fieldValuesCache for PV " + this.getName());
+        logger.debug("Construct the fieldValuesCache for PV " + this.getName());
         boolean excludeV4Changes = true;
         this.fieldValuesCache = new FieldValuesCache(data, excludeV4Changes);
         this.timeStampBits = this.fieldValuesCache.getTimeStampBits();
@@ -245,18 +247,18 @@ private void setupDBRType(PVAStructure data) {
 
         if (archDBRType == null || con == null) {
             String structureID = data.formatType();
-            logger.info("Type from structure in monitorConnect is " + structureID);
+            logger.debug("Type from structure in monitorConnect is " + structureID);
 
             PVAData valueField = data.get("value");
             if (valueField == null) {
                 archDBRType = ArchDBRTypes.DBR_V4_GENERIC_BYTES;
             } else {
-                logger.info("Value field in monitorConnect is of type " + valueField.getType());
+                logger.debug("Value field in monitorConnect is of type " + valueField.getType());
                 archDBRType = determineDBRType(structureID, valueField.getType(), valueField.formatType());
             }
 
             con = configservice.getArchiverTypeSystem().getV4Constructor(archDBRType);
-            logger.info("Determined ArchDBRTypes for " + this.name + " as " + archDBRType);
+            logger.debug("Determined ArchDBRTypes for " + this.name + " as " + archDBRType);
         }
     }
 
@@ -288,8 +290,8 @@ public void handleMonitor(PVAChannel channel, BitSet changes, BitSet overruns, P
         logger.debug("handleMonitor: {}", data);
         if (data == null) {
             logger.warn("Server ends subscription for " + this.name);
-            unsubscribe();
-            fireDisconnected();
+            this.scheduleCommand(this::handleDisconnected);
+            return;
         }
 
         state = PVConnectionState.GotMonitor;
@@ -335,7 +337,7 @@ private void scheduleCommand(final Runnable command) {
     }
 
     private void connect() {
-        logger.info("Connecting to PV " + this.name);
+        logger.debug("Connecting to PV " + this.name);
         this.scheduleCommand(new Runnable() {
             @Override
             public void run() {
@@ -373,13 +375,11 @@ private void handleConnected() {
 
         state = PVConnectionState.Connected;
 
-        for (final PVListener listener : listeners) {
-            listener.pvConnected(this);
-        }
+        fireConnected();
 
         if (!running) {
-            connected = true;
             synchronized (this) {
+                connected = true;
                 this.notifyAll();
             }
             return;
@@ -406,6 +406,17 @@ private void disconnect() {
         fireDisconnected();
     }
 
+    private void handleDisconnected() {
+        if (state == PVConnectionState.Disconnected) return;
+        state = PVConnectionState.Disconnected;
+        synchronized (this) {
+            connected = false;
+        }
+
+        unsubscribe();
+        fireDisconnected();
+    }
+
     /** Subscribe for value updates. */
     private void subscribe() {
         synchronized (this) {