Merge branch '2.3.x' into 2.3.x-saas

Conflicts: airtime_mvc/application/controllers/PreferenceController.php
2013-02-04 16:22:35 -05:00 · 2013-02-04 16:22:35 -05:00 · c398ce930b
commit c398ce930b
parent 0ea7cca966 e2472f1f5d
17 changed files with 190 additions and 117 deletions
--- a/python_apps/pypo/pypocli.py
+++ b/python_apps/pypo/pypocli.py
@ -179,7 +179,14 @@ if __name__ == '__main__':

    ReplayGainUpdater.start_reply_gain(api_client)

-    api_client.register_component("pypo")
+    success = False
+    while not success:
+        try:
+            api_client.register_component('pypo')
+            success = True
+        except Exception, e:
+            logger.error(str(e))
+            time.sleep(10)

    pypoFetch_q = Queue()
    recorder_q = Queue()