diff options
Diffstat (limited to 'core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report')
| -rwxr-xr-x | core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report | 53 |
1 files changed, 44 insertions, 9 deletions
diff --git a/core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report b/core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report index 67f6b47a..501cdff0 100755 --- a/core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report +++ b/core/modules/debug-report-bwlp/data/opt/openslx/bin/debug_report @@ -13,16 +13,27 @@ TOOLS=" dmidecode " -URL="http://132.230.8.113/error_report.php" +URLS=" + https://bwlp-masterserver.ruf.uni-freiburg.de/error_report.php + http://132.230.8.113/error_report.php + end +" if [ "$UID" != "0" ]; then echo "Debug Reports können nur von root versendet werden" >&2 exit 1 fi -if ! curl -H "Expect:" -f -s -S --connect-timeout 5 "$URL" > /dev/null; then - echo "Kann den Debug-Report-Server in Freiburg nicht erreichen. :-(" >&2 - exit 1 +if [ "$1" = "--local" ]; then + localReport=true +else + for URL in $URLS; do + if [ "$URL" = "end" ]; then + echo "Kann den Debug-Report-Server in Freiburg nicht erreichen. :-(" >&2 + exit 1 + fi + curl -L -H "Expect:" -f -s -S --connect-timeout 5 "$URL" > /dev/null && break + done fi rm -rf /tmp/debug-report @@ -63,7 +74,17 @@ for srv in $SLX_NTP_SERVER 0.de.pool.ntp.org; do done echo -n "..." -cp /opt/openslx/config /tmp/udhcpclog /opt/openslx/config.tgz.list static/ 2> /dev/null +cp /opt/openslx/config /tmp/udhcpclog /opt/openslx/config.tgz.list \ + /tmp/xsession-log-* \ + /tmp/remote_log_check-* \ + static/ 2> /dev/null +echo -n "." + +for file in /home/*/.xsession-errors; do + [ -f "$file" ] || continue + cp "$file" "static/${file////_}" #/////////777-7-7 +done + echo -n "." FILES=$(find /tmp/vmware* /tmp/virt /tmp/vmchooser* -type f \( -name "*.log" -o -name "*.conf" -o -name "*.xml" -o -name "vmx" \) 2> /dev/null) @@ -106,6 +127,9 @@ echo -n "." fdisk -l -u > "generated/fdisk-out" 2> "generated/fdisk-err" echo -n "." +blkid > "generated/blkid-out" 2> "generated/blkid-err" +echo -n "." + ls -al /dev /dev/disk/* &> "generated/ls-dev-and-disks" echo -n "." @@ -126,6 +150,14 @@ echo "..fertig!" cd /tmp rm -f -- error-report.tar.gz + +if [ "$localReport" = "true" ]; then + dirname="debug-report-$(date +"%Y-%m-%d_%H-%M-%S")" + mv debug-report "$dirname" + echo "Fehlerbericht wird NICHT versendet und liegt unter: $(pwd)/$dirname" + exit +fi + echo -n "Packe Fehlerbericht ein..." if ! tar czf error-report.tar.gz debug-report; then echo "Fehler beim Packen des Berichts!" >&2 @@ -134,10 +166,13 @@ fi echo "....fertig!" echo -n "Lade Fehlerbericht hoch...." -if ! curl -H "Expect:" -f -s -S -F "file=@error-report.tar.gz;filename=report" "$URL" > /dev/null; then - echo "Fehler beim Hochladen des Fehlerberichts :-(" >&2 - exit 1 -fi +for URL in $URLS; do + if [ "$URL" = "end" ]; then + echo "Fehler beim Hochladen des Fehlerberichts :-(" >&2 + exit 1 + fi + curl -L -H "Expect:" -f -s -S -F "file=@error-report.tar.gz;filename=report" "$URL" > /dev/null && break +done echo "Fehlerbericht erfolgreich versendet!" |