diff --git a/handlers/http_error_report.php b/handlers/http_error_report.php index b961b37ef..e638c47f7 100644 --- a/handlers/http_error_report.php +++ b/handlers/http_error_report.php @@ -13,7 +13,16 @@ $message = "Hello, this is an Entropy error report.\n"; $message .= $_POST['stacktrace']; $message .= "\n\n"; $message .= $_POST['errordata']; -$message .= "\n\nArchitecture: " . $arch . "\n"; +$message .= "\n\n"; +$message .= $_POST['processes']; +$message .= "\n\n"; +$message .= $_POST['lspci']; +$message .= "\n\n"; +$message .= $_POST['dmesg']; +$message .= "\n\n"; +$message .= "Architecture: " . $arch . "\n"; +$message .= "Arguments: " . $_POST['arguments'] . "\n"; +$message .= "UID: " . $_POST['uid'] . "\n"; $message .= 'Name: ' . $name . "\n"; $message .= 'E-mail: ' . $email . "\n"; $message .= 'Description: ' . $description . "\n"; diff --git a/libraries/entropy.py b/libraries/entropy.py index dbbb50902..86870aa73 100644 --- a/libraries/entropy.py +++ b/libraries/entropy.py @@ -6716,6 +6716,15 @@ class ErrorReportInterface: self.params['version'] = etpConst['entropyversion'] self.params['errordata'] = report_data self.params['description'] = description + self.params['arguments'] = ' '.join(sys.argv) + self.params['uid'] = etpConst['uid'] + try: + import commands + self.params['processes'] = commands.getoutput('ps auxf') + self.params['lspci'] = commands.getoutput('lspci') + self.params['dmesg'] = commands.getoutput('dmesg') + except: + pass self.generated = True # params is a dict, key(HTTP post item name): value