external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-12 17:07:23 +01:00
Code Issues Releases Wiki Activity

Improve output formatting

Browse Source
This commit is contained in:
downtownallday
2022-06-29 12:30:38 -04:00
parent 8f1bb4f498
commit ecf5e3ddfb
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/lib/rest.sh
View File

@@ -106,11 +106,15 @@ rest_urlencoded() {
fi
fi
if [ $REST_HTTP_CODE -lt 200 -o $REST_HTTP_CODE -ge 300 ]; then
REST_ERROR="REST status $REST_HTTP_CODE: $REST_OUTPUT"
if [ -z "$REST_OUTPUT" ]; then
REST_ERROR="Server returned status $REST_HTTP_CODE"
else
REST_ERROR="Server returned status $REST_HTTP_CODE: $REST_OUTPUT"
fi
echo "${F_DANGER}$REST_ERROR${F_RESET}" 1>&2
if $is_local && [ $REST_HTTP_CODE -ge 500 ]; then
echo -n "$F_WARN"
tail -100 /var/log/syslog
tail -100 /var/log/syslog | grep -i "(traceback|err|warn|fail|fatal|uncaught)" 1>&2
echo -n "$F_RESET"
fi
return 2