mirror/XenOrchestraInstallerUpdater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix wrong set flag and reset trap setting so that service startup logs end up to logfile, if it fails

Browse Source
This commit is contained in:
ronivay
2019-01-15 13:51:40 +02:00
parent 3f20aca2c6
commit abcfd98813
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xo-install.sh
View File

@@ -483,8 +483,9 @@ function InstallXO {
echo "Starting xo-server..." echo "Starting xo-server..."
/bin/systemctl start xo-server >/dev/null /bin/systemctl start xo-server >/dev/null
# no need to exit on errors anymore # no need to exit/trap on errors anymore
set +x set +e
trap - ERR INT
timeout 60 bash <<-"EOF" timeout 60 bash <<-"EOF"
while [[ -z $(journalctl -u xo-server | sed -n 'H; /Starting XO Server/h; ${g;p;}' | grep "https\{0,1\}:\/\/\[::\]:$PORT") ]]; do while [[ -z $(journalctl -u xo-server | sed -n 'H; /Starting XO Server/h; ${g;p;}' | grep "https\{0,1\}:\/\/\[::\]:$PORT") ]]; do
@@ -503,6 +504,7 @@ function InstallXO {
else else
echo echo
echo "Looks like there was a problem when starting xo-server/reading journalctl. Please see logs for more details" echo "Looks like there was a problem when starting xo-server/reading journalctl. Please see logs for more details"
journalctl -u xo-server -n 50 >> $LOGFILE
exit 1 exit 1
fi fi