Merge branch 'saas-dev' into soundcloud

Conflicts:
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js

python_apps/airtime-celery/setup.py

@@ -35,7 +35,7 @@ def postinst():
     os.chmod('/var/log/airtime', 0775)
 
     # Create the Celery user
-    call(['adduser', '--no-create-home', '--home', '/var/lib/celery', '--gecos', '""', '--disabled-login', 'celery'])
+    call(['adduser', '--no-create-home', '--home', '/var/lib/celery', '--gecos', '', '--disabled-login', 'celery'])
     # Add celery to the www-data group
     call(['usermod', '-G', 'www-data', '-a', 'celery'])
 

python_apps/pypo/pypo/listenerstat.py

@@ -150,6 +150,7 @@ class ListenerStat(Thread):
                 self.logger.error('Exception: %s', e)
 
             time.sleep(120)
+        self.logger.info('ListenerStat thread exiting')
 
 
 if __name__ == "__main__":

python_apps/pypo/pypo/pypofile.py

@@ -5,6 +5,8 @@ from Queue import Empty
 
 import logging
 import shutil
+import time
+import traceback
 import os
 import sys
 import stat
@@ -203,5 +205,10 @@ class PypoFile(Thread):
         """
         Entry point of the thread
         """
-        self.main()
+        try: self.main()
+        except Exception, e:
+            top = traceback.format_exc()
+            self.logger.error('PypoFile Exception: %s', top)
+            time.sleep(5)
+        self.logger.info('PypoFile thread exiting')
 

python_apps/pypo/pypo/pypopush.py

@@ -153,4 +153,5 @@ class PypoPush(Thread):
                 top = traceback.format_exc()
                 self.logger.error('Pypo Push Exception: %s', top)
                 time.sleep(5)
+        self.logger.info('PypoPush thread exiting')