diff options
| author | Simon Rettberg | 2014-01-13 14:11:28 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2014-01-13 14:11:28 +0100 |
| commit | f853dc0f548ba86181e2c2682629b4d51d302efd (patch) | |
| tree | acf120952c8a3cdd28f07080e4da18657ead62a5 /remote/rootfs | |
| parent | [vmchooser] Refining iptables MASQUERADE rule to work around an issue where i... (diff) | |
| parent | update cups to work with ubuntu 13.10 (diff) | |
| download | tm-scripts-f853dc0f548ba86181e2c2682629b4d51d302efd.tar.gz tm-scripts-f853dc0f548ba86181e2c2682629b4d51d302efd.tar.xz tm-scripts-f853dc0f548ba86181e2c2682629b4d51d302efd.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote/rootfs')
| -rwxr-xr-x | remote/rootfs/rootfs-stage32/data/opt/openslx/bin/slxlog | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/slxlog b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/slxlog index afe72a2d..b80d55cf 100755 --- a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/slxlog +++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/slxlog @@ -47,18 +47,27 @@ if [ $# -lt 2 ]; then else MSG="$2" fi -MSG="[$(whoami)] $MSG" +USER=$(whoami) +MSG="[$USER] $MSG" if [ $# -gt 2 ]; then EXTRA="$3" fi -if [ -n "$EXTRA" ] && [ -r "$EXTRA" -a -s "$EXTRA" ] && [ "$(stat -c %s "$EXTRA")" -lt "10000" ]; then - curl --data-urlencode "type=$TYPE" --data-urlencode "description=$MSG" --data-urlencode "longdesc@$EXTRA" "$SLX_REMOTE_LOG" > /dev/null 2>&1 & -elif [ -n "$EXTRA" ]; then - curl --data-urlencode "type=$TYPE" --data-urlencode "description=$MSG" --data-urlencode "longdesc=Missing/too large: $EXTRA" "$SLX_REMOTE_LOG" > /dev/null 2>&1 & +if [ -n "$SLX_DEBUG" ]; then + CURLLOG="/tmp/slxlog.$USER" else - curl --data-urlencode "type=$TYPE" --data-urlencode "description=$MSG" "$SLX_REMOTE_LOG" > /dev/null 2>&1 & + CURLLOG="/dev/null" +fi + +if [ -n "$EXTRA" ] && [ -r "$EXTRA" -a -s "$EXTRA" ] && [ "$(stat -c %s "$EXTRA")" -lt "10000" ]; then # valid file attachment + curl --data-urlencode "type=$TYPE" --data-urlencode "description=$MSG" --data-urlencode "longdesc@$EXTRA" "$SLX_REMOTE_LOG" >> "$CURLLOG" 2>&1 & +elif [ -z "$EXTRA" ]; then # no attachment + curl --data-urlencode "type=$TYPE" --data-urlencode "description=$MSG" "$SLX_REMOTE_LOG" >> "$CURLLOG" 2>&1 & +elif [ -s "$EXTRA" ]; then # empty attachment file (or missing) + curl --data-urlencode "type=$TYPE" --data-urlencode "description=$MSG" --data-urlencode "longdesc=Attachment too large: $EXTRA" "$SLX_REMOTE_LOG" >> "$CURLLOG" 2>&1 & +else # attachment file to big (more than 10k) + curl --data-urlencode "type=$TYPE" --data-urlencode "description=$MSG" --data-urlencode "longdesc=Attachment missing/empty: $EXTRA" "$SLX_REMOTE_LOG" >> "$CURLLOG" 2>&1 & fi exit 0 |