From 16fc8d5818d402708dfe7beed757b9aa0cd9d42f Mon Sep 17 00:00:00 2001
From: KeyserSosa <chris@reddit.com>
Date: Mon, 26 Jan 2009 15:33:13 -0800
Subject: [PATCH] updates to service monitor.  fix 500 on /api/info for empty
 listings

---
 r2/r2/lib/jsontemplates.py    | 2 +-
 r2/r2/templates/panestack.xml | 2 +-
 r2/supervise_watcher.py       | 9 ---------
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/r2/r2/lib/jsontemplates.py b/r2/r2/lib/jsontemplates.py
index de8325077..f59637869 100644
--- a/r2/r2/lib/jsontemplates.py
+++ b/r2/r2/lib/jsontemplates.py
@@ -302,7 +302,7 @@ class RedditJsonTemplate(JsonTemplate):
 
 class PanestackJsonTemplate(JsonTemplate):
     def render(self, thing = None, *a, **kw):
-        res = [t.render() for t in thing.stack] if thing else []
+        res = [t.render() for t in thing.stack if t] if thing else []
         res = [x for x in res if x]
         if not res:
             return {}
diff --git a/r2/r2/templates/panestack.xml b/r2/r2/templates/panestack.xml
index 50e702bdb..49732b7fe 100644
--- a/r2/r2/templates/panestack.xml
+++ b/r2/r2/templates/panestack.xml
@@ -21,5 +21,5 @@
 ################################################################################
 
 %for t in thing.stack:
-${t.render()}
+${t.render() if t else ''}
 %endfor
diff --git a/r2/supervise_watcher.py b/r2/supervise_watcher.py
index e56624a8d..28d520889 100644
--- a/r2/supervise_watcher.py
+++ b/r2/supervise_watcher.py
@@ -298,15 +298,6 @@ def run_top(proc_ids = [], name = '', exe = "/usr/bin/top"):
 
     handle = subprocess.Popen(cmd, stdout = subprocess.PIPE,
                               stderr = subprocess.PIPE)
-    if handle.wait():
-        cmd = [exe, '-l', '1', '-p',
-               "^aaaaa ^nnnnnnnnn X X X X X X ^ccccc 0.0" +
-               " ^wwwwwwwwwww ^bbbbbbbbbbbbbbb"]
-        handle = subprocess.Popen(cmd, stdout = subprocess.PIPE,
-                                  stderr = subprocess.PIPE)
-        if handle.wait():
-            raise ValueError, "failed to run top"
-
     proc_ids = set(map(int, proc_ids))
     res = {}
     for line in handle.communicate()[0].split('\n'):