Merge branch 'master' of /srv/git/brain

brain.py

@@ -37,17 +37,21 @@ conf['ext_render'] = ['.md','.txt','.jpg','.gif','.png']
 conf['ext_edit'] = ['.md','.txt','.rb','.py','.pl','.sh']
 
 def get_secrets(url = False):
-    if url:
-        query = 'SELECT base_url,username,password,id FROM `secrets` WHERE base_url LIKE "%' + url + '";'
-    else:
-        query = 'SELECT base_url,username,password,id FROM `secrets`;'
+    def generate_query():
+        if url:
+            query = 'SELECT base_url,username,password,id FROM `secrets` WHERE base_url LIKE "%' + url + '";'
+        else:
+            query = 'SELECT base_url,username,password,id FROM `secrets`;'
+        return query
 
-    cursor.execute(query)
+    cursor.execute(generate_query())
     secrets = cursor.fetchall()
 
     if not len(secrets) > 0:
+        print 'No secrets for ' + url + ' expanding search.'
         url = get_domain(url)
-        cursor.execute(query)
+        print 'Trying ' + url + '.'
+        cursor.execute(generate_query())
         secrets = cursor.fetchall()
 
     return secrets

serve.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+while [ 1 ] 
+do
+    echo "Starting server."
+    python brain.py
+    echo "Server died.\nSleeping for 5 seconds."
+    sleep 5
+done