diff options
| author | Bruno Cesar Ribas <brunoribas@gmail.com> | 2018-08-30 22:26:10 +0000 |
|---|---|---|
| committer | Bruno Cesar Ribas <brunoribas@gmail.com> | 2018-08-30 22:26:10 +0000 |
| commit | 500a4e7982d383f2757fea0ea30ae0ea3e3b167a (patch) | |
| tree | abb7ef79685a75228c23096837fe12fd736ec456 | |
| parent | e7541534f206afb7288eed1285a68dd9204a3ec0 (diff) | |
| parent | c200f2a4c272d150d93b0cb962de0463a5688452 (diff) | |
| download | boca-500a4e7982d383f2757fea0ea30ae0ea3e3b167a.tar.gz boca-500a4e7982d383f2757fea0ea30ae0ea3e3b167a.zip | |
Merge remote-tracking branch 'origin/develc' into devel
| -rw-r--r-- | src/logexternal.php | 4 | ||||
| -rw-r--r-- | tools/boca-submit-log | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/logexternal.php b/src/logexternal.php index 811d4f9..114c1d9 100644 --- a/src/logexternal.php +++ b/src/logexternal.php @@ -49,6 +49,10 @@ if(isset($_POST["comp"]) && $_POST["comp"] != "" ) { @file_put_contents("/var/www/boca/src/private/logexternal/" . $secret[0] . '.' . $name . '.logsession', "\nbegin(" . time() . ',' . date(DATE_RFC2822) . ")\n" . base64_decode($_POST['logsession']), LOCK_EX | FILE_APPEND); if(isset($_POST['logfs'])) @file_put_contents("/var/www/boca/src/private/logexternal/" . $secret[0] . '.' . $name . '.logfs', "\nbegin(" . time() . ',' . date(DATE_RFC2822) . ")\n" . base64_decode($_POST['logfs']), LOCK_EX | FILE_APPEND); + if(isset($_POST['loglshw'])) + @file_put_contents("/var/www/boca/src/private/logexternal/" . $secret[0] . '.' . $name . '.loglshw', "\nbegin(" . time() . ',' . date(DATE_RFC2822) . ")\n" . base64_decode($_POST['loglshw']), LOCK_EX | FILE_APPEND); + if(isset($_POST['logupd'])) + @file_put_contents("/var/www/boca/src/private/logexternal/" . $secret[0] . '.' . $name . '.logupd', "\nbegin(" . time() . ',' . date(DATE_RFC2822) . ")\n" . base64_decode($_POST['logupd']), LOCK_EX | FILE_APPEND); if(isset($_POST['logkfs'])) @file_put_contents("/var/www/boca/src/private/logexternal/" . $secret[0] . '.' . $name . '.logkfs', "\nbegin(" . time() . ',' . date(DATE_RFC2822) . ")\n" . base64_decode($_POST['logkfs']), LOCK_EX | FILE_APPEND); if(isset($_POST['logkeys'])) diff --git a/tools/boca-submit-log b/tools/boca-submit-log index f06efb9..40a6fb7 100644 --- a/tools/boca-submit-log +++ b/tools/boca-submit-log @@ -28,6 +28,10 @@ for zcount in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do [ -f /root/.logsession ] || touch /root/.logsession diff /root/.logsession /root/.logsession.tmp > /root/.logsession.diff 2>/dev/null res=$? + lshw > /root/.loglshw.tmp 2>/dev/null + [ -f /root/.loglshw ] || touch /root/.loglshw + diff /root/.loglshw /root/.loglshw.tmp > /root/.loglshw.diff 2>/dev/null + reslshw=$? journalctl | grep -i mount | tail -n 500 > /root/.logfs.tmp [ -f /root/.logfs ] || touch /root/.logfs @@ -50,7 +54,7 @@ for zcount in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do reskeys=0 fi - if [ "$res" != "0" -o "$resfs" != "0" -o "$reskfs" != "0" -o "$reskeys" != "0" ]; then + if [ "$res" != "0" -o "$resfs" != "0" -o "$reslshw" != "0" -o "$reskfs" != "0" -o "$reskeys" != "0" ]; then for i in uuencode wget tr perl sha256sum cut; do p=`which $i` if [ -x "$p" ]; then @@ -74,6 +78,8 @@ for zcount in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do grep "^>" /root/.logsession.diff | uuencode -m zzzzzzzzzz | grep -v "begin-base64.*zzzzzzzzzz" | perl -MURI::Escape -lne 'print uri_escape($_)' >> $temp echo -n "&logfs=" >> $temp grep "^>" /root/.logfs.diff | uuencode -m zzzzzzzzzz | grep -v "begin-base64.*zzzzzzzzzz" | perl -MURI::Escape -lne 'print uri_escape($_)' >> $temp + echo -n "&loglshw=" >> $temp + grep "^>" /root/.loglshw.diff | uuencode -m zzzzzzzzzz | grep -v "begin-base64.*zzzzzzzzzz" | perl -MURI::Escape -lne 'print uri_escape($_)' >> $temp echo -n "&logkfs=" >> $temp grep "^>" /root/.logkfs.diff | uuencode -m zzzzzzzzzz | grep -v "begin-base64.*zzzzzzzzzz" | perl -MURI::Escape -lne 'print uri_escape($_)' >> $temp echo -n "&logkeys=" >> $temp |