Merge pull request #3 from ControlSystemStudio/settings_fix

Settings handling fix

Author: georgweiss

src/main/java/org/phoebus/pvws/EpicsConfiguration.java

@@ -40,6 +40,27 @@ public class EpicsConfiguration {
     @Value("${PV_DEFAULT_TYPE:ca}")
     private String pvDefaultType;
 
+    @Value("${EPICS_PVA_ADDR_LIST}")
+    private String epicsPvaAddrList;
+
+    @Value("${EPICS_PVA_AUTO_ADDR_LIST:YES}")
+    private String epicsPvaAutoAddrList;
+
+    @Value("${EPICS_PVA_BROADCAST_PORT:5076}")
+    private String epicsPvaBroadcastPort;
+
+    @Value("${EPICS_PVA_NAME_SERVERS}")
+    private String epicsPvaNameServers;
+
+    @Value("${PV_THROTTLE_MS:1000}")
+    private String pvThrottleMs;
+
+    @Value("${PV_ARRAY_THROTTLE_MS:10000}")
+    private String pvArrayThrottleMs;
+
+    @Value("${PV_WRITE_SUPPORT:true}")
+    private String pvWriteSupport;
+
     @PostConstruct
     public void init() {
         logger.log(Level.INFO, "===========================================");
@@ -57,24 +78,27 @@ else if (pvDefaultType != null && !pvDefaultType.isEmpty()) {
         }
         logger.log(Level.INFO, "PV_DEFAULT_TYPE=" + Preferences.userRoot().node("/org/phoebus/pv").get("default", null));
 
+        Preferences.userRoot().node("/org/phoebus/pv/pva").put("epics_pva_addr_list", epicsPvaAddrList);
+
+        if(!epicsPvaAutoAddrList.isEmpty()){
+            Preferences.userRoot().node("/org/phoebus/pv/pva").put("epics_pva_auto_addr_list", epicsPvaAutoAddrList);
+        }
+
+        Preferences.userRoot().node("/org/phoebus/pv/pva").put("epics_pva_broadcast_port", epicsPvaBroadcastPort);
+        Preferences.userRoot().node("/org/phoebus/pv/pva").put("epics_pva_name_servers", epicsPvaNameServers);
+
+        System.setProperty("PV_THROTTLE_MS", pvThrottleMs);
+        System.setProperty("PV_ARRAY_THROTTLE_MS", pvArrayThrottleMs);
+        System.setProperty("PV_WRITE_SUPPORT", pvWriteSupport);
 
         // Configure JCA/CAJ to use environment vars, not java properties or preferences
-        System.setProperty("jca.use_env", "false");
-
-        for (String name : new String[]
-                {
-                        "PV_DEFAULT_TYPE",
-                        "PV_THROTTLE_MS",
-                        "PV_ARRAY_THROTTLE_MS",
-                        "PV_WRITE_SUPPORT",
-                        "EPICS_CA_ADDR_LIST",
-                        "EPICS_CA_AUTO_ADDR_LIST",
-                        "EPICS_CA_MAX_ARRAY_BYTES",
-                        "EPICS_PVA_ADDR_LIST",
-                        "EPICS_PVA_AUTO_ADDR_LIST"
-                })
-            logger.log(Level.INFO, name + " = " + System.getenv(name));
+        System.setProperty("jca.use_env", "true");
 
+        logger.log(Level.INFO, "EPICS_CA_ADDR_LIST=" + System.getenv("EPICS_CA_ADDR_LIST"));
+        logger.log(Level.INFO, "EPICS_CA_AUTO_ADDR_LIST=" + System.getenv("EPICS_CA_AUTO_ADDR_LIST"));
+        logger.log(Level.INFO, "EPICS_CA_MAX_ARRAY_BYTES=" + System.getenv("EPICS_CA_MAX_ARRAY_BYTES"));
+        logger.log(Level.INFO, "EPICS_PVA_ADDR_LIST=" + epicsPvaAddrList);
+        logger.log(Level.INFO, "EPICS_PVA_AUTO_ADDR_LIST=" + epicsPvaAutoAddrList);
 
         logger.log(Level.INFO, "===========================================");
 

src/main/java/org/phoebus/pvws/ws/WebSocketPV.java

@@ -11,6 +11,8 @@
 import org.epics.vtype.VType;
 import org.phoebus.pv.PV;
 import org.phoebus.pv.PVPool;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
@@ -48,25 +50,23 @@ public class WebSocketPV
 
     static
     {
-        String spec = System.getenv("PV_THROTTLE_MS");
+        String spec = System.getProperty("PV_THROTTLE_MS");
         if (spec == null)
             THROTTLE_MS = 1000;
         else
             THROTTLE_MS = Integer.parseInt(spec);
 
-        spec = System.getenv("PV_ARRAY_THROTTLE_MS");
+        spec = System.getProperty("PV_ARRAY_THROTTLE_MS");
         if (spec == null)
             ARRAY_THROTTLE_MS = 10000;
         else
             ARRAY_THROTTLE_MS = Integer.parseInt(spec);
 
-        spec = System.getenv("PV_WRITE_SUPPORT");
+        spec = System.getProperty("PV_WRITE_SUPPORT");
         if(spec != null && !spec.isEmpty()){
             PV_WRITE_SUPPORT = "true".equalsIgnoreCase(spec);
         }
 
-        PV_WRITE_SUPPORT = true;
-
         logger.log(Level.INFO, "PV_THROTTLE_MS = " + THROTTLE_MS);
         logger.log(Level.INFO, "PV_ARRAY_THROTTLE_MS = " + ARRAY_THROTTLE_MS);
         logger.log(Level.INFO, "PV_WRITE_SUPPORT = " + PV_WRITE_SUPPORT);

src/main/resources/application.properties

@@ -3,17 +3,13 @@ server.servlet.contextPath=/pvws
 server.servlet.application-display-name=PVWS
 server.port=8080
 
-server.shutdown=graceful
 spring.lifecycle.timeout-per-shutdown-phase=1m
 
 PV_DEFAULT_TYPE=pva
 PV_THROTTLE_MS=1000
 PV_ARRAY_THROTTLE_MS=10000
 PV_WRITE_SUPPORT=true
 
-EPICS_CA_ADDR_LIST=
-EPICS_CA_MAX_ARRAY_BYTES=
-
 EPICS_PVA_ADDR_LIST=
 EPICS_PVA_AUTO_ADDR_LIST=YES
 EPICS_PVA_BROADCAST_PORT=5076