Browse Source

[jobbrowser] Log all caught naked "except:" blocks

Erick Tryzelaar 10 years ago
parent
commit
6983c0cbd9

+ 3 - 1
apps/jobbrowser/src/jobbrowser/models.py

@@ -234,7 +234,7 @@ class Job(JobLinkage):
   def get_task(self, id):
     try:
       return self.task_map[id]
-    except:
+    except KeyError:
       return JobLinkage.get_task(self, id)
 
   def filter_tasks(self, task_types=None, task_states=None, task_text=None):
@@ -568,6 +568,7 @@ class LinkJobLogs(object):
     try:
       return '<a href="%s" target="_blank">%s</a>' % (location_to_url(match.group(0), strict=False), match.group(0))
     except:
+      LOGGER.exception('failed to replace hdfs links: %s' % (match.groups(),))
       return match.group(0)
 
   @classmethod
@@ -575,6 +576,7 @@ class LinkJobLogs(object):
     try:
       return '<a href="%s" target="_blank">%s</a>' % (reverse('jobbrowser.views.single_job', kwargs={'job': match.group(0)}), match.group(0))
     except:
+      LOGGER.exception('failed to replace mr links: %s' % (match.groups(),))
       return match.group(0)
 
 

+ 2 - 2
apps/jobbrowser/src/jobbrowser/tests.py

@@ -132,7 +132,7 @@ class TestJobBrowserWithHadoop(unittest.TestCase, OozieServerProvider):
       # Remove user home directories.
       self.cluster.fs.do_as_superuser(self.cluster.fs.rmtree, self.home_dir)
     except:
-      pass
+      LOG.exception('failed to teardown %s' self.home_dir)
     self.cluster.fs.setuser(self.prev_user)
 
   def create_design(self):
@@ -186,7 +186,7 @@ class TestJobBrowserWithHadoop(unittest.TestCase, OozieServerProvider):
       self.cluster.fs.mkdir(INPUT_DIR)
       self.cluster.fs.rmtree(OUTPUT_DIR)
     except:
-      pass
+      LOG.exception('failed to teardown tests')
 
     response = self.client.post(reverse('jobsub.views.new_design', kwargs={'node_type': 'mapreduce'}), {
         'name': ['test_failed_jobs-1'],

+ 1 - 1
apps/jobbrowser/src/jobbrowser/views.py

@@ -296,7 +296,7 @@ def job_attempt_logs_json(request, job, attempt_index=0, name='syslog', offset=0
       debug_info += '\nHTML Response: %s' % response
       LOGGER.error(debug_info)
     except:
-      pass
+      LOGGER.exception('failed to create debug info')
 
   response = {'log': LinkJobLogs._make_hdfs_links(log), 'debug': debug_info}
 

+ 1 - 1
apps/jobbrowser/src/jobbrowser/yarn_models.py

@@ -369,7 +369,7 @@ class Attempt:
           debug_info += '\nHTML Response: %s' % response
           LOGGER.error(debug_info)
         except:
-          pass
+          LOG.exception('failed to build debug info')
 
       logs.append(log)