File tree Expand file tree Collapse file tree 1 file changed +6
-1
lines changed
core/pva/src/main/java/org/epics/pva Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -219,7 +219,7 @@ public class PVASettings
219219 public static int EPICS_PVA_TCP_SOCKET_TMO = 5 ;
220220
221221 /** Maximum number of array elements shown when printing data */
222- public static int EPICS_PVA_MAX_ARRAY_FORMATTING = 256 ;
222+ public static int EPICS_PVA_MAX_ARRAY_FORMATTING = 50 ;
223223
224224 /** Range of beacon periods in seconds recognized as "fast, new" beacons
225225 * that re-start searches for disconnected channels.
@@ -275,6 +275,11 @@ public class PVASettings
275275 EPICS_PVAS_TLS_OPTIONS = get ("EPICS_PVAS_TLS_OPTIONS" , EPICS_PVAS_TLS_OPTIONS );
276276 require_client_cert = EPICS_PVAS_TLS_OPTIONS .contains ("client_cert=require" );
277277 EPICS_PVA_TLS_KEYCHAIN = get ("EPICS_PVA_TLS_KEYCHAIN" , EPICS_PVA_TLS_KEYCHAIN );
278+ if (EPICS_PVA_TLS_KEYCHAIN .isEmpty () && !EPICS_PVAS_TLS_KEYCHAIN .isEmpty ())
279+ {
280+ EPICS_PVA_TLS_KEYCHAIN = EPICS_PVAS_TLS_KEYCHAIN ;
281+ logger .log (Level .CONFIG , "EPICS_PVA_TLS_KEYCHAIN (empty) updated from EPICS_PVAS_TLS_KEYCHAIN" );
282+ }
278283 EPICS_PVA_SEND_BUFFER_SIZE = get ("EPICS_PVA_SEND_BUFFER_SIZE" , EPICS_PVA_SEND_BUFFER_SIZE );
279284 EPICS_PVA_FAST_BEACON_MIN = get ("EPICS_PVA_FAST_BEACON_MIN" , EPICS_PVA_FAST_BEACON_MIN );
280285 EPICS_PVA_FAST_BEACON_MAX = get ("EPICS_PVA_FAST_BEACON_MAX" , EPICS_PVA_FAST_BEACON_MAX );
You can’t perform that action at this time.
0 commit comments