Merge branch 'bug/DB_Lock' into 'dev'

CRITICAL: Move all other models to Queue DB.

See merge request crafty-controller/crafty-commander!241

app/classes/models/crafty_permissions.py

@@ -6,7 +6,6 @@ from app.classes.models.users import Users, ApiKeys, users_helper
 
 try:
     from peewee import (
-        SqliteDatabase,
         Model,
         ForeignKeyField,
         CharField,
@@ -14,6 +13,7 @@ try:
         DoesNotExist,
     )
     from enum import Enum
+    from playhouse.sqliteq import SqliteQueueDatabase
 
 except ModuleNotFoundError as e:
     helper.auto_installer_fix(e)
@@ -21,8 +21,9 @@ except ModuleNotFoundError as e:
 logger = logging.getLogger(__name__)
 peewee_logger = logging.getLogger("peewee")
 peewee_logger.setLevel(logging.INFO)
-database = SqliteDatabase(
-    helper.db_path, pragmas={"journal_mode": "wal", "cache_size": -1024 * 10}
+database = SqliteQueueDatabase(
+    helper.db_path
+    # pragmas={"journal_mode": "wal", "cache_size": -1024 * 10}
 )
 
 

app/classes/models/management.py

@@ -10,7 +10,6 @@ from app.classes.web.websocket_helper import websocket_helper
 
 try:
     from peewee import (
-        SqliteDatabase,
         Model,
         ForeignKeyField,
         CharField,
@@ -22,6 +21,7 @@ try:
         BooleanField,
     )
     from playhouse.shortcuts import model_to_dict
+    from playhouse.sqliteq import SqliteQueueDatabase
 
 except ModuleNotFoundError as e:
     helper.auto_installer_fix(e)
@@ -29,8 +29,9 @@ except ModuleNotFoundError as e:
 logger = logging.getLogger(__name__)
 peewee_logger = logging.getLogger("peewee")
 peewee_logger.setLevel(logging.INFO)
-database = SqliteDatabase(
-    helper.db_path, pragmas={"journal_mode": "wal", "cache_size": -1024 * 10}
+database = SqliteQueueDatabase(
+    helper.db_path
+    # pragmas={"journal_mode": "wal", "cache_size": -1024 * 10}
 )
 
 # **********************************************************************************
@@ -381,7 +382,6 @@ class helpers_management:
             conf["excluded_dirs"] = dirs_to_exclude
         conf["compress"] = compress
         if not new_row:
-            with database.atomic():
             if backup_path is not None:
                 u1 = (
                     Servers.update(backup_path=backup_path)
@@ -390,12 +390,9 @@ class helpers_management:
                 )
             else:
                 u1 = 0
-                u2 = (
-                    Backups.update(conf).where(Backups.server_id == server_id).execute()
-                )
+            u2 = Backups.update(conf).where(Backups.server_id == server_id).execute()
             logger.debug(f"Updating existing backup record.  {u1}+{u2} rows affected")
         else:
-            with database.atomic():
             conf["server_id"] = server_id
             if backup_path is not None:
                 Servers.update(backup_path=backup_path).where(

app/classes/models/roles.py

@@ -5,7 +5,6 @@ from app.classes.shared.helpers import helper
 
 try:
     from peewee import (
-        SqliteDatabase,
         Model,
         CharField,
         DoesNotExist,
@@ -13,6 +12,7 @@ try:
         DateTimeField,
     )
     from playhouse.shortcuts import model_to_dict
+    from playhouse.sqliteq import SqliteQueueDatabase
 
 except ModuleNotFoundError as e:
     helper.auto_installer_fix(e)
@@ -20,8 +20,9 @@ except ModuleNotFoundError as e:
 logger = logging.getLogger(__name__)
 peewee_logger = logging.getLogger("peewee")
 peewee_logger.setLevel(logging.INFO)
-database = SqliteDatabase(
-    helper.db_path, pragmas={"journal_mode": "wal", "cache_size": -1024 * 10}
+database = SqliteQueueDatabase(
+    helper.db_path
+    # pragmas={"journal_mode": "wal", "cache_size": -1024 * 10}
 )
 
 # **********************************************************************************
@@ -74,7 +75,6 @@ class helper_roles:
 
     @staticmethod
     def remove_role(role_id):
-        with database.atomic():
         role = Roles.get(Roles.role_id == role_id)
         return role.delete_instance()
 

app/classes/models/server_permissions.py

@@ -8,7 +8,6 @@ from app.classes.shared.permission_helper import permission_helper
 
 try:
     from peewee import (
-        SqliteDatabase,
         Model,
         ForeignKeyField,
         CharField,
@@ -16,6 +15,7 @@ try:
         JOIN,
     )
     from enum import Enum
+    from playhouse.sqliteq import SqliteQueueDatabase
 
 except ModuleNotFoundError as e:
     helper.auto_installer_fix(e)
@@ -23,8 +23,9 @@ except ModuleNotFoundError as e:
 logger = logging.getLogger(__name__)
 peewee_logger = logging.getLogger("peewee")
 peewee_logger.setLevel(logging.INFO)
-database = SqliteDatabase(
-    helper.db_path, pragmas={"journal_mode": "wal", "cache_size": -1024 * 10}
+database = SqliteQueueDatabase(
+    helper.db_path
+    # pragmas={"journal_mode": "wal", "cache_size": -1024 * 10}
 )
 
 # **********************************************************************************
@@ -193,11 +194,8 @@ class Permissions_Servers:
 
     @staticmethod
     def remove_roles_of_server(server_id):
-        with database.atomic():
         return (
-                Role_Servers.delete()
-                .where(Role_Servers.server_id == server_id)
-                .execute()
+            Role_Servers.delete().where(Role_Servers.server_id == server_id).execute()
         )
 
     @staticmethod

app/classes/models/servers.py

@@ -6,7 +6,6 @@ from app.classes.shared.main_models import db_helper
 
 try:
     from peewee import (
-        SqliteDatabase,
         Model,
         ForeignKeyField,
         CharField,
@@ -16,6 +15,7 @@ try:
         IntegerField,
         FloatField,
     )
+    from playhouse.sqliteq import SqliteQueueDatabase
 
 except ModuleNotFoundError as e:
     helper.auto_installer_fix(e)
@@ -23,8 +23,9 @@ except ModuleNotFoundError as e:
 logger = logging.getLogger(__name__)
 peewee_logger = logging.getLogger("peewee")
 peewee_logger.setLevel(logging.INFO)
-database = SqliteDatabase(
-    helper.db_path, pragmas={"journal_mode": "wal", "cache_size": -1024 * 10}
+database = SqliteQueueDatabase(
+    helper.db_path
+    # pragmas={"journal_mode": "wal", "cache_size": -1024 * 10}
 )
 
 # **********************************************************************************
@@ -141,7 +142,6 @@ class helper_servers:
 
     @staticmethod
     def remove_server(server_id):
-        with database.atomic():
         Servers.delete().where(Servers.server_id == server_id).execute()
 
     @staticmethod
@@ -224,21 +224,18 @@ class helper_servers:
 
     @staticmethod
     def sever_crashed(server_id):
-        with database.atomic():
         Server_Stats.update(crashed=True).where(
             Server_Stats.server_id == server_id
         ).execute()
 
     @staticmethod
     def set_download(server_id):
-        with database.atomic():
         Server_Stats.update(downloading=True).where(
             Server_Stats.server_id == server_id
         ).execute()
 
     @staticmethod
     def finish_download(server_id):
-        with database.atomic():
         Server_Stats.update(downloading=False).where(
             Server_Stats.server_id == server_id
         ).execute()
@@ -252,7 +249,6 @@ class helper_servers:
 
     @staticmethod
     def server_crash_reset(server_id):
-        with database.atomic():
         Server_Stats.update(crashed=False).where(
             Server_Stats.server_id == server_id
         ).execute()
@@ -272,7 +268,6 @@ class helper_servers:
             Server_Stats.select().where(Server_Stats.server_id == server_id)
         except Exception as ex:
             logger.error(f"Database entry not found! {ex}")
-        with database.atomic():
         Server_Stats.update(updating=value).where(
             Server_Stats.server_id == server_id
         ).execute()
@@ -293,7 +288,6 @@ class helper_servers:
         except Exception as ex:
             logger.error(f"Database entry not found! {ex}")
             return
-        with database.atomic():
         Server_Stats.update(first_run=False).where(
             Server_Stats.server_id == server_id
         ).execute()
@@ -337,7 +331,6 @@ class helper_servers:
             Server_Stats.select().where(Server_Stats.server_id == server_id)
         except Exception as ex:
             logger.error(f"Database entry not found! {ex}")
-        with database.atomic():
         Server_Stats.update(waiting_start=value).where(
             Server_Stats.server_id == server_id
         ).execute()

app/classes/models/users.py

@@ -7,7 +7,6 @@ from app.classes.shared.helpers import helper
 
 try:
     from peewee import (
-        SqliteDatabase,
         Model,
         ForeignKeyField,
         CharField,
@@ -19,6 +18,7 @@ try:
         JOIN,
     )
     from playhouse.shortcuts import model_to_dict
+    from playhouse.sqliteq import SqliteQueueDatabase
 
 except ModuleNotFoundError as e:
     helper.auto_installer_fix(e)
@@ -26,8 +26,9 @@ except ModuleNotFoundError as e:
 logger = logging.getLogger(__name__)
 peewee_logger = logging.getLogger("peewee")
 peewee_logger.setLevel(logging.INFO)
-database = SqliteDatabase(
-    helper.db_path, pragmas={"journal_mode": "wal", "cache_size": -1024 * 10}
+database = SqliteQueueDatabase(
+    helper.db_path
+    # pragmas={"journal_mode": "wal", "cache_size": -1024 * 10}
 )
 
 # **********************************************************************************
@@ -232,7 +233,6 @@ class helper_users:
 
     @staticmethod
     def remove_user(user_id):
-        with database.atomic():
         User_Roles.delete().where(User_Roles.user_id == user_id).execute()
         user = Users.get(Users.user_id == user_id)
         return user.delete_instance()