Merge branch 'master' of github.com:pajlada/pajbot

pajbot · Sep 19, 2016 · 2cf0d98 · 2cf0d98
2 parents 6ab4d91 + f7a49f4
commit 2cf0d98
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/pajbot/models/user.py b/pajbot/models/user.py
@@ -133,11 +133,15 @@ def sql_save(self, save_to_db=True):
         if not self.model_loaded:
             return
 
-        if save_to_db and not self.shared_db_session:
-            with DBManager.create_session_scope(expire_on_commit=False) as db_session:
-                db_session.add(self.user_model)
+        try:
+            if save_to_db and not self.shared_db_session:
+                with DBManager.create_session_scope(expire_on_commit=False) as db_session:
+                    # log.debug('Calling db_session.add on {}'.format(self.user_model))
+                    db_session.add(self.user_model)
 
-        UserSQLCache.save(self.user_model)
+            UserSQLCache.save(self.user_model)
+        except:
+            log.exception('Caught exception in sql_save while saving {}'.format(self.user_model))
 
     @property
     def id(self):

diff --git a/pajbot/web/__init__.py b/pajbot/web/__init__.py
@@ -35,8 +35,6 @@ def init(args):
 
     log = logging.getLogger(__name__)
 
-    log.info('XD')
-
     config = configparser.ConfigParser()
 
     config = load_config(args.config)
@@ -50,6 +48,10 @@ def init(args):
         salt = generate_random_salt()
         config.set('web', 'pleblist_password_salt', salt.decode('utf-8'))
 
+    if 'pleblist_password' not in config['web']:
+        salt = generate_random_salt()
+        config.set('web', 'pleblist_password', salt.decode('utf-8'))
+
     if 'secret_key' not in config['web']:
         salt = generate_random_salt()
         config.set('web', 'secret_key', salt.decode('utf-8'))