salt/firestarter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unify error message format

Browse Source
This commit is contained in:
Salt 2019-06-21 19:12:41 -05:00
parent 510ffbdbeb
commit ba5915bb58
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firestarter
View File

@ -285,7 +285,7 @@ step_check() {
# If it's not our session then who cares # If it's not our session then who cares
[ "$_sessionid" != "$(< "/proc/$pid/sessionid")" ] && continue [ "$_sessionid" != "$(< "/proc/$pid/sessionid")" ] && continue
if [ "$pid" != "$BASHPID" ]; then if [ "$pid" != "$BASHPID" ]; then
err "Firestarter is already running" 40 err "Firestarter is already running: $pid" 40
fi fi
done done
fi fi
@ -371,7 +371,7 @@ step_execute() {
# Ensure we have a config directory # Ensure we have a config directory
if ! [ -d "$_configdir" ]; then if ! [ -d "$_configdir" ]; then
if ! mkdir -p "$_configdir" > /dev/null 2>&1; then if ! mkdir -p "$_configdir" > /dev/null 2>&1; then
err "Failed to create configuration directory \"$_configdir\"" 52 err "Failed to create configuration directory: \"$_configdir\"" 52
fi fi
fi fi
# Ensure we can log if we have to # Ensure we can log if we have to
@ -379,7 +379,7 @@ step_execute() {
log "No logs will be created per FS_NOLOG" log "No logs will be created per FS_NOLOG"
elif ! [ -d "$_logdir" ]; then elif ! [ -d "$_logdir" ]; then
if ! mkdir -p "$_logdir" > /dev/null 2>&1; then if ! mkdir -p "$_logdir" > /dev/null 2>&1; then
err "Failed to create log directory \"$_logdir\"" 53 err "Failed to create log directory: \"$_logdir\"" 53
fi fi
fi fi
# Parse configs # Parse configs