Changeset 779:98a7abceb685 in hatta-dev

Timestamp:

07/16/10 19:44:20 (19 months ago)

Author:

Cezary Krzyżanowski <cezary.krzyzanowski@…>

Branch:

default

Message:

Added exception catching and reporting via e-mail. New ErrorDialog to display details and send updates. hatta.py errors go to Radomir, GUI related go to me.

Files:

• HattaError.ui (added)
• error.png (added)
• error_dialog.py (added)
• hatta_qticon.py (modified) (6 diffs)
• ui_errorDialog.py (added)

hatta_qticon.py

@@ -15 +15 @@
 from thread import start_new_thread
 from time import sleep
-from urllib import urlopen, unquote
+from traceback import format_exc
+from urllib import urlopen, quote
 from wsgiref import simple_server
 import gettext
@@ -30 +31 @@
     QMessageBox, QAction, QKeySequence, QWidget, QVBoxLayout, QGridLayout,
     QLabel, QSpinBox, QToolTip, QLineEdit, QHBoxLayout, QPushButton,
-    QFileDialog, QPixmap, QCheckBox, QDesktopServices)
+    QFileDialog, QPixmap, QCheckBox, QDesktopServices, QDialog)
 from PyQt4.QtCore import (QString, QThread, pyqtSignal, pyqtSlot, Qt,
     QPoint, QLocale)
 
 from hatta import WikiConfig, Wiki, WikiRequest, project_name, project_url
+
+from error_dialog import ErrorDialog
 
 def we_are_frozen():
@@ -85 +88 @@
         except Exception as e:
             self.exception_signal.emit(unicode(e))
+            # It's very important to shut down the thread, so that the threaded 
+            # werkzeug won't continue to run and send other exceptions.
+            self.quit()
 
     def quit(self):
@@ -384 +390 @@
     pyqtSlot(str)
     def on_error(self, strerror):
-        """Displays errors from exceptions."""
-        QMessageBox.critical(None, 'Exception',
-            _(u'Error: %(error_string)s') %
-                dict(error_string=strerror), 1, 2)
+        """Displays error and send bug request."""
+        report_bug('bugs@hatta-wiki.org', strerror)
 
     def _make_discovery_action(self, name, host, port):
@@ -580 +584 @@
             bool(self.should_announce))
 
+
+error_dialog = None
+def report_bug(email, caption):
+    error_dialog.prepare_error(unicode(caption), format_exc())
+    if error_dialog.exec_() == QDialog.Accepted:
+        link = 'mailto:%s?subject=%s&body=%s' % (
+            email,
+            quote(u'[Bug] ' + unicode(caption)),
+            quote(error_dialog.get_bug_dump()))
+        webbrowser.open(link)
+    QApplication.exit()
+
 if __name__ == '__main__':
     try:
@@ -594 +610 @@
         translation.install(unicode=1)
 
-        app = QApplication(sys.argv)
-        QApplication.setQuitOnLastWindowClosed(False)
-        status_icon = HattaTrayIcon()
-        app.exec_()
+        try:
+            app = QApplication(sys.argv)
+            QApplication.setQuitOnLastWindowClosed(False)
+            error_dialog = ErrorDialog()
+            status_icon = HattaTrayIcon()
+            app.exec_()
+        except Exception as e:
+            report_bug('dhubleizh@o2.pl', unicode(e))
     except KeyboardInterrupt:
         pass