Fix crash handling once more.

BonsaiDen · Mar 20, 2010 · ce70b0b · ce70b0b
1 parent 1f7b25e
commit ce70b0b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/atarashii/usr/bin/atarashii b/atarashii/usr/bin/atarashii
@@ -43,12 +43,12 @@ else:
             print "Importing Atarashii failed"
             break
 
-        elif error == os.EX_OK:
+        elif error in (os.EX_OK, 1): # 1 = Due to a sigkill etc. 
             print "Atarashii has been closed"
             break
 
         else:
-            atarashii.crash()
+            atarashii.crash(error)
             if restart_count > restart_max:
                 break
 

diff --git a/atarashii/usr/share/pyshared/atarashii/gui.py b/atarashii/usr/share/pyshared/atarashii/gui.py
@@ -481,7 +481,8 @@ def show_favorite_error(self, name, mode):
 
     def show_crash_report(self):
         dialog.MessageDialog(self, MESSAGE_WARNING, 
-               "Atarashii has crashed and automatically restarted itself.",
+               ("Atarashii has crashed and automatically restarted itself.\n"
+               "<b>Error:</b> %s") % self.main.settings['crash_reason'],
                lang.error_title)
 
 

diff --git a/atarashii/usr/share/pyshared/atarashii/settings.py b/atarashii/usr/share/pyshared/atarashii/settings.py
@@ -91,8 +91,8 @@ def save(self):
             if self.values.has_key("crashed"):
                 del self.values['crashed']
 
-            if self.values.has_key("time_before_crash"):
-                del self.values['time_before_crash']
+            if self.values.has_key("crash_reason"):
+                del self.values['crash_reason']
 
             # Test
             settings_file = open(os.path.join(self.dir, 'atarashii.conf'), "w")
@@ -110,8 +110,8 @@ def save(self):
                 else:
                     vtype = "str"
 
-                settings_file.write("%s %s %s\n" % (urllib.quote(name), vtype,
-                                    value))
+                settings_file.write("%s %s %s\n" 
+                                     % (urllib.quote(name), vtype, value))
 
             settings_file.close()
 
@@ -207,6 +207,9 @@ def check_autostart(self):
     def check_crash(self):
         self['crashed'] = os.path.exists(CRASH_FILE)
         if self['crashed']:
+            cfp = open(CRASH_FILE, "rb")
+            self['crash_reason'] = cfp.read()
+            cfp.close()
             print "ERROR: Atarashii crashed!"
 
 
@@ -227,10 +230,11 @@ def check_cache(self):
 
 # Create Crashfile -------------------------------------------------------------
 # ------------------------------------------------------------------------------
-def crash_file(mode):
+def crash_file(mode, data = None):
     try:
         if mode:
             cfp = open(CRASH_FILE, "wb")
+            cfp.write(str(data))
             cfp.close()
 
         elif os.path.exists(CRASH_FILE):