Skip to content

Commit

Permalink
Default caPort and pvaPort to be enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
tynanford committed Jun 14, 2024
1 parent 15a58e0 commit d0089c2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions server/cf.conf
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ procs = cf

[cf]
# cf-store application
# Uncomment line below to turn on the feature to add CA/PVA port info for name server to channelfinder
# iocConnectionInfo = on
# Uncomment line below to turn off the feature to add CA/PVA port info for name server to channelfinder
# iocConnectionInfo = off
# Uncomment line below to turn on the feature to add alias records to channelfinder
# alias = on
# Uncomment line below to turn on the feature to add EPICS record type to channelfinder
Expand Down
4 changes: 2 additions & 2 deletions server/demo.conf
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ idkey = 42

[cf]
# cf-store application
# Uncomment line below to turn on the feature to add CA/PVA port info for name server to channelfinder
# iocConnectionInfo = on
# Uncomment line below to turn off the feature to add CA/PVA port info for name server to channelfinder
# iocConnectionInfo = off
# Uncomment line below to turn on the feature to add alias records to channelfinder
# alias = on
# Uncomment line below to turn on the feature to add EPICS record type to channelfinder
Expand Down
2 changes: 1 addition & 1 deletion server/recceiver/cfstore.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def _startServiceWithLock(self):
reqd_props.add(cf_prop_name)
# Standard property names for CA/PVA name server connections. These are
# environment variables from reccaster so take advantage of env_vars
if self.conf.get('iocConnectionInfo', 'default') == 'on':
if self.conf.get('iocConnectionInfo', 'default') == 'off':
self.env_vars["RSRV_SERVER_PORT"] = "caPort"
self.env_vars["PVAS_SERVER_PORT"] = "pvaPort"
reqd_props.add("caPort")
Expand Down

0 comments on commit d0089c2

Please sign in to comment.