Skip to content

Commit 59523e2

Browse files
committed
MNT: remove restartdaq dependency on netconfig, sdfconfig not suitable so worse ux for now
1 parent 406dccb commit 59523e2

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

scripts/restartdaq

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,19 @@ DAQNETWORK='fez'
8989
PROCMGR="/reg/g/pcds/dist/pds/$HUTCH/current/tools/procmgr/procmgr"
9090

9191
if [ "$IS_DAQ_HOST" == 0 ]; then
92-
HOSTS=$(netconfig search "$HUTCH"-*-$DAQNETWORK --brief | sed s/-$DAQNETWORK//g)
93-
WORKINGHOSTS=''
94-
#make sure at least cds is up.
95-
for HOST in $HOSTS; do
96-
if [[ $(ping -w 2 "$HOST" >/dev/null 2>&1) == 0 ]]; then
97-
WORKINGHOSTS=$WORKINGHOSTS' '$HOST
98-
fi
99-
done
100-
echo "$AIMHOST" does not have "$DAQNETWORK", please choose one of the following machines to run the DAQ: "$WORKINGHOSTS"
92+
# There is currently no suitable way to find daq-compatible hosts in sdfconfig
93+
# Maybe this will work in the future, disable for now and have worse UX
94+
# HOSTS=$(sdfconfig search --type subnet PCDSN-${DAQNETWORK^^}-${HUTCH^^} --brief)
95+
# WORKINGHOSTS=''
96+
# #make sure at least cds is up.
97+
# for HOST in $HOSTS; do
98+
# if [[ $(ping -w 2 "$HOST" >/dev/null 2>&1) == 0 ]]; then
99+
# WORKINGHOSTS=$WORKINGHOSTS' '$HOST
100+
# fi
101+
# done
102+
# Placeholder less useful message:
103+
echo "$AIMHOST" does not have "$DAQNETWORK", please choose a server with "$DAQNETWORK"
104+
# echo "$AIMHOST" does not have "$DAQNETWORK", please choose one of the following machines to run the DAQ: "$WORKINGHOSTS"
101105
echo "restartdaq -m <machine_with_$DAQNETWORK>"
102106
exit
103107
fi

0 commit comments

Comments
 (0)