Skip to content
Snippets Groups Projects
Commit 14e93148 authored by Thomas Juerges's avatar Thomas Juerges
Browse files

L2SS-218. Taking Jan David's recommendation in to account

- Replace the set +e/set -e with || true when loading the Tango DB.
- Explain why in the world I am starting dsconfig twice.
parent 1f2b26ef
No related branches found
No related tags found
1 merge request!33Resolve L2SS-218 "Move existing tooling to bootstrap dir"
This commit is part of merge request !33. Comments created here will be created in the context of that merge request.
...@@ -55,8 +55,12 @@ function start_minimal_tango() ...@@ -55,8 +55,12 @@ function start_minimal_tango()
{ {
(cd ${HOME_DIR}/docker-compose (cd ${HOME_DIR}/docker-compose
make minimal make minimal
# There is an issue with the dsconfig container that it every
# other time just exits without telling why.
# Therefore start dsconfig, then wait for 10s to allow it
# to die and just start it again.
# Don't they say that the second time is always a charm?
make start dsconfig make start dsconfig
# Just for good measure, wait a moment and start dsconfig again
echo -e "\tWaiting for dsconfig to settle down..." echo -e "\tWaiting for dsconfig to settle down..."
sleep 10 sleep 10
echo -e "\tDone.\n\tStarting dsconfig again." echo -e "\tDone.\n\tStarting dsconfig again."
...@@ -65,10 +69,8 @@ function start_minimal_tango() ...@@ -65,10 +69,8 @@ function start_minimal_tango()
function configure_tango_db() function configure_tango_db()
{ {
# This somehow returns with a non-0 return code. # This somehow returns with a non-0 return code, make Bash happy.
set +e ${HOME_DIR}/sbin/update_ConfigDb.sh ${HOME_DIR}/CDB/LOFAR_ConfigDb.json || true
${HOME_DIR}/sbin/update_ConfigDb.sh ${HOME_DIR}/CDB/LOFAR_ConfigDb.json
set -e
} }
function configure_elk() function configure_elk()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment