samply/bridgehead
1
0
Fork 0
mirror of https://github.com/samply/bridgehead.git synced 2025-06-17 03:40:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Ensured Usage of Log Function

Browse Source 
This should ensure a more consistent script output
This commit is contained in:
Torben Brenner
2022-05-17 15:55:25 +02:00
parent 986dd133bd
commit 54897057d9
5 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/functions.sh
View File

@ -2,13 +2,13 @@
exitIfNotRoot() {
if [ "$EUID" -ne 0 ]; then
echo "Please run as root"
log "ERROR" "Please run as root"
exit 1
fi
}
log() {
echo "$(date +'%Y-%m-%d %T')" "$1:" "$2"
echo -e "$(date +'%Y-%m-%d %T')" "$1:" "$2"
}
printUsage() {
@ -18,7 +18,7 @@ printUsage() {
checkRequirements() {
if ! lib/prerequisites.sh; then
log ERROR "Validating Prerequisites failed, please fix the error(s) above this line."
log "ERROR" "Validating Prerequisites failed, please fix the error(s) above this line."
exit 1
else
return 0
@ -38,12 +38,12 @@ fetchVarsFromVault() {
return 0
fi
log INFO "Fetching secrets from vault ..."
log "INFO" "Fetching secrets from vault ..."
[ -e /etc/bridgehead/vault.conf ] && source /etc/bridgehead/vault.conf
if [ -z "$BW_MASTERPASS" ] || [ -z "$BW_CLIENTID" ] || [ -z "$BW_CLIENTSECRET" ]; then
log ERROR "Please supply correct credentials in /etc/bridgehead/vault.conf."
log "ERROR" "Please supply correct credentials in /etc/bridgehead/vault.conf."
return 1
fi
@ -67,4 +67,4 @@ fetchVarsFromVault() {
##Setting Network properties
export HOSTIP=$(MSYS_NO_PATHCONV=1 docker run --rm --add-host=host.docker.internal:host-gateway ubuntu cat /etc/hosts | grep 'host.docker.internal' | awk '{print $1}');
export HOST=$(hostname)
export HOST=$(hostname)