Adding active premiums to status page.

templates/rss_feeds/status.xhtml

@@ -16,6 +16,7 @@
     <th>Subs</th>
     <th>Active</th>
     <th>Premium</th>
+    <th>Act. Prem</th>
     <th>Per Month</th>
   </tr>
   {% for feed in feeds %}
@@ -29,9 +30,10 @@
       </td>
       <td>{{ feed.min_to_decay }}</td>
       <td>{{ feed.num_subscribers }}</td>
-      <td>{{ feed.active_subscribers }}</td>
-      <td>{{ feed.premium_subscribers }}</td>
-      <td>{{ feed.average_stories_per_month }}</td>
+      <td {% if feed.active_subscribers == 0 %}style="color: lightgrey"{% endif %}>{{ feed.active_subscribers }}</td>
+      <td {% if feed.premium_subscribers == 0 %}style="color: lightgrey"{% endif %}>{{ feed.premium_subscribers }}</td>
+      <td {% if feed.active_premium_subscribers == 0 %}style="color: lightgrey"{% endif %}>{{ feed.active_premium_subscribers }}</td>
+      <td {% if feed.average_stories_per_month == 0 %}style="color: lightgrey"{% endif %}>{{ feed.average_stories_per_month }}</td>
     </tr>
   {% endfor %}
 

utils/kill_celery.sh

@@ -1,11 +1,13 @@
 #!/bin/sh
 
-for i in `ps -o pid,command ax | grep celery | awk '!/awk/ && !/grep/ {print $1}'`
-do
-    if [ "${i}" != "" ]; then
-        print "Killing: ${i}";
-        kill -9 ${i};
-    fi
-done
+pkill -9 -f celery
+
+# for i in `ps -o pid,command ax | grep celery | awk '!/awk/ && !/grep/ {print $1}'`
+# do
+#     if [ "${i}" != "" ]; then
+#         print "Killing: ${i}";
+#         kill -9 ${i};
+#     fi
+# done
 
 # ps aux | grep celery | egrep -v grep | awk '{print $2}' | xargs kill -9

utils/kill_gunicorn.sh

@@ -1,11 +1,13 @@
 #!/bin/sh
 
-for i in `ps -o pid,command ax | grep gunicorn | awk '!/awk/ && !/grep/ {print $1}'`
-do
-    if [ "${i}" != "" ]; then
-        print "Killing: ${i}";
-        kill -9 ${i};
-    fi
-done
+pkill -9 -f gunicorn
+
+# for i in `ps -o pid,command ax | grep gunicorn | awk '!/awk/ && !/grep/ {print $1}'`
+# do
+#     if [ "${i}" != "" ]; then
+#         print "Killing: ${i}";
+#         kill -9 ${i};
+#     fi
+# done
 
 # ps aux | grep gunicorn | egrep -v grep | awk '{print $2}' | xargs kill -9