Debug: Change error reporter to use squash_python

This completely obsoletes errorreporting.py.

errorreporting.py

@@ -1,273 +0,0 @@
-"""Copyright (c) 2010-2012 David Rio Vierra
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-errorreporting.py
-
-Patch the `traceback' module to print "self" with each stack frame.
-"""
-import collections
-import sys
-import traceback
-import platform
-from datetime import datetime
-import os
-import json
-import httplib
-import zlib
-import directories
-import mcplatform
-import release
-import logging
-log = logging.getLogger(__name__)
-
-def extract_tb(tb, limit=None):
-    """Return list of up to limit pre-processed entries from traceback.
-
-    This is useful for alternate formatting of stack traces.  If
-    'limit' is omitted or None, all entries are extracted.  A
-    pre-processed stack trace entry is a quadruple (filename, line
-    number, function name, text) representing the information that is
-    usually printed for a stack trace.  The text is a string with
-    leading and trailing whitespace stripped; if the source is not
-    available it is None.
-    """
-    if limit is None:
-        if hasattr(sys, 'tracebacklimit'):
-            limit = sys.tracebacklimit
-    list = []
-    n = 0
-    while tb is not None and (limit is None or n < limit):
-        f = tb.tb_frame
-        lineno = tb.tb_lineno
-        co = f.f_code
-        filename = co.co_filename
-        name = co.co_name
-        self = f.f_locals.get('self')
-        try:
-            selfstr = self and "(self is a {0})".format(self.__class__.__name__) or " "
-        except:
-            selfstr = " "
-        traceback.linecache.checkcache(filename)
-        line = traceback.linecache.getline(filename, lineno, f.f_globals)
-        if line:
-            line = line.strip()
-        else:
-            line = None
-        list.append((filename, lineno, name, line, selfstr))
-        tb = tb.tb_next
-        n = n + 1
-    return list
-
-
-def format_list(extracted_list):
-    """Format a list of traceback entry tuples for printing.
-
-    Given a list of tuples as returned by extract_tb() or
-    extract_stack(), return a list of strings ready for printing.
-    Each string in the resulting list corresponds to the item with the
-    same index in the argument list.  Each string ends in a newline;
-    the strings may contain internal newlines as well, for those items
-    whose source text line is not None.
-    """
-    list = []
-    for filename, lineno, name, line, selfstr in reversed(extracted_list):
-        item = '  File "%s", line %d, in %s %s\n' % (filename, lineno, name, selfstr[:60])
-        if line:
-            item = item + '    %s\n' % line.strip()
-        list.append(item)
-    return list
-
-traceback.extract_tb = extract_tb
-traceback.format_list = format_list
-
-EXCEPTIONAL_API_KEY = "37eaf2a19432e268829ef4fa35921ad399bbda80"
-
-def sanitize(s):
-    parentDir = mcplatform.parentDir
-    minecraftDir = mcplatform.minecraftDir
-    home = os.path.expanduser("~")
-
-    s = s.replace(parentDir, "[MCEdit folder]")
-    s = s.replace(repr(parentDir)[1:-1], "[MCEdit folder]")
-    s = s.replace(minecraftDir, "[Minecraft folder]")
-    s = s.replace(repr(minecraftDir)[1:-1], "[Minecraft folder]")
-    s = s.replace(home, "[User home folder]")
-    s = s.replace(repr(home)[1:-1], "[User home folder]")
-    return s
-
-def get_backtrace():
-    tb = sys.exc_traceback
-    backtrace = []
-    for filename, lineno, name, line, selfstr in reversed(extract_tb(tb)):
-        backtrace.append({
-            "file":os.path.normpath(filename).replace(directories.dataDir, "").replace(".pyo", ".py").replace(".pyc", ".py").replace(os.path.sep, "/"),
-            "line":lineno,
-            "symbol":name,
-        })
-
-    return backtrace
-
-def json_crash_report():
-    """
-    fields = arguments[1] || new Object();
-        fields.api_key = this.options.APIKey;
-        fields.environment = this.options.environment;
-        fields.client = "javascript";
-        fields.revision = this.options.revision;
-        fields.class_name = error.type || error.name;
-        if (!error.name && (matches = error.message.match(/^(Uncaught )?(\w+): (.+)/))) {
-          fields.class_name = matches[2];
-          fields.message = matches[3];
-        } else {
-          fields.message = error.message;
-        }
-        if ((_ref5 = fields.class_name) == null) {
-          fields.class_name = 'Error';
-        }
-        fields.backtraces = buildBacktrace(error.stack);
-        fields.capture_method = error.mode;
-        fields.occurred_at = ISODateString(new Date());
-        fields.schema = window.location.protocol.replace(/:$/, '');
-        fields.host = window.location.hostname;
-        if (window.location.port.length > 0) {
-          fields.port = window.location.port;
-        }
-        fields.path = window.location.pathname;
-        fields.query = window.location.search;
-        if (window.location.hash !== '') {
-          fields.fragment = window.location.hash;
-        }
-        fields.user_agent = navigator.userAgent;
-        fields.screen_width = screen.width;
-        fields.screen_height = screen.height;
-        fields.window_width = window.innerWidth;
-        fields.window_height = window.innerHeight;
-        fields.color_depth = screen.colorDepth;
-    :return:
-    :rtype:
-    """
-    exc_class, exc_value, exc_tb = sys.exc_info()
-
-    fields = {}
-    fields['revision'] = release.commit
-    fields['build'] = release.release
-
-    fields['client'] = 'MCEdit Client(?)'
-
-    fields['backtraces'] = [{
-        "name":"Crashed Thread",
-        "faulted": True,
-        "backtrace": get_backtrace(),
-    }]
-
-    fields['class_name'] = exc_class.__name__
-    if isinstance(exc_value, UnicodeError):
-        fields['message'] = exc_class.__name__
-    else:
-        try:
-            fields['message'] = sanitize(str(exc_value))
-        except:
-            fields['message'] = "unknown"
-
-    fields['occurred_at'] = datetime.now().isoformat()
-
-    try:
-        os.getcwdu().encode('ascii')
-        ascii_cwd = True
-    except UnicodeEncodeError:
-        ascii_cwd = False
-
-    if 'build' in release.release:
-        environment = 'testing'
-    elif "-debug" in sys.argv:
-        environment = 'development'
-    else:
-        environment = 'production'
-        
-    fields['environment'] = environment
-
-    fields['application_root_directory'] = "ASCII" if ascii_cwd else "Unicode"
-    fields['language_version'] = sys.version
-
-    fields['api_key'] = "6ea52b17-ac76-4fd8-8db4-2d7303473ca2"
-
-    fields['device_type'] = platform.processor() # 'Intel64 Family 6 Model 30 Stepping 5, GenuineIntel'
-
-    fields['operating_system'] = platform.system() # 'Windows'
-    fields['os_version'] = platform.release() # '7'
-    fields['os_build'] = platform.version() # '6.1.7601'
-
-    fields['architecture'] = platform.architecture() # 'AMD64'
-
-    fields['FS_ENCODING'] = sys.getfilesystemencoding()
-
-    if 'LANG' in os.environ:
-        fields['LANG'] = os.environ['LANG']
-
-    try:
-        from albow import root
-        fields['FRAMES'] = str(root.get_root().frames)
-    except:
-        log.info("Can't get frame count")
-
-    try:
-        from OpenGL import GL
-        fields['GL_VERSION'] = GL.glGetString(GL.GL_VERSION)
-    except:
-        log.info("Can't get GL_VERSION")
-
-    try:
-        from OpenGL import GL
-        fields['GL_VENDOR'] = GL.glGetString(GL.GL_VENDOR)
-    except:
-        log.info("Can't get GL_VENDOR")
-
-
-    try:
-        from OpenGL import GL
-        fields['GL_RENDERER'] = GL.glGetString(GL.GL_RENDERER)
-    except:
-        log.info("Can't get GL_RENDERER")
-
-    return json.dumps(fields)
-
-def post_crash_report():
-    """
-
-        body = JSON.stringify(fields);
-        this.HTTPTransmit(this.options.APIHost + this.options.notifyPath, [['Content-Type', 'application/json']], body);
-    """
-
-    report = json_crash_report()
-
-    #conn = httplib.HTTPConnection("192.168.1.108", 3000)
-    #conn.request("POST", "http://192.168.1.108:3000/bugs", body)
-    conn = httplib.HTTPConnection("bugs.mcedit.net")
-    headers = { "Content-type": "application/octet-stream" }
-
-    conn.request("POST", "/bugs.php?foo=bar", report, headers)
-
-
-    resp = conn.getresponse()
-    print "Response status: %s\n Response data: %s\n" % (resp.status, resp.read())
-    conn.close()
-
-
-def reportException():
-    try:
-        import config
-        if config.config.getboolean("Settings", "report crashes new"):
-            post_crash_report()
-    except Exception, e:
-        print "Error while reporting crash: ", repr(e)

mcedit.py

@@ -8,7 +8,6 @@ Startup, main menu, keyboard configuration, automatic updating.
 import OpenGL
 import sys
 import os
-import errorreporting
 
 if "-debug" not in sys.argv:
     OpenGL.ERROR_CHECKING = False
@@ -983,6 +982,23 @@ def main(argv):
     Setup display, bundled schematics. Handle unclean
     shutdowns.
     """
+    client = None
+    try:
+        import squash_python
+        version = release.get_version()
+        client = squash_python.get_client()
+        client.APIKey = "6ea52b17-ac76-4fd8-8db4-2d7303473ca2"
+        client.environment = "testing" if "build" in version else "production"
+        client.host = "http://bugs.mcedit.net"
+        client.notifyPath = "/bugs.php"
+        client.revision = release.get_commit()
+        client.build = version
+        client.timeout = 5
+        client.disabled = not config.config.getboolean("Settings", "report crashes new")
+        client.reportErrors()
+        client.hook()
+    except ImportError:
+        pass
 
     try:
         display.init()
@@ -1011,18 +1027,15 @@ def main(argv):
 
     try:
         MCEdit.main()
-    except SystemExit:
+    except Exception:
-        return 0
-    except Exception, e:
-        logging.error('An unhandled error occured.', exc_info=True)
-        errorreporting.reportException()
         logging.error("MCEdit version %s", release.get_version())
         display.quit()
         if hasattr(sys, 'frozen') and sys.platform == 'win32':
             print "Press RETURN or close this window to dismiss."
             raw_input()
 
-        return 1
+        raise
+
     return 0
 
 

mceutils.py

@@ -24,7 +24,6 @@ import config
 from cStringIO import StringIO
 from datetime import datetime
 import directories
-from errorreporting import reportException
 import httplib
 import mcplatform
 import numpy
@@ -53,7 +52,12 @@ def alertException(func):
         except Exception, e:
             logging.exception("Exception:")
             if ask("Error during {0}: {1!r}".format(func, e)[:1000], ["Report Error", "Okay"], default=1, cancel=0) == "Report Error":
-                reportException()
+                try:
+                    import squash_python
+                    squash_python.get_client().recordException(*sys.exc_info())
+                except ImportError:
+                    pass
+
 
     return _alertException