Catch sqlite3.ProgrammingError along peewees OperationalError

golem/database/database.py

@@ -1,6 +1,7 @@
 import datetime
 import logging
 import os
+import sqlite3
 import time
 from typing import Optional, Type, Sequence
 
@@ -27,11 +28,14 @@ def execute_sql(self, sql, params=None, require_commit=True):
             iterations += 1
             try:
                 return super().execute_sql(sql, params, require_commit)
-            except peewee.OperationalError as e:
+            except (
+                    sqlite3.ProgrammingError,
+                    peewee.OperationalError,
+            ) as e:
                 # Ignore transaction rollbacks
                 if str(e).startswith('no such savepoint'):
                     logger.warning('execute_sql() tx rollback failed: %r', e)
-                    return
+                    return None
                 # Check retry deadline
                 elif datetime.datetime.now() > deadline:
                     logger.warning(

golem/network/transport/msg_queue.py

@@ -34,9 +34,9 @@ def get(node_id: str) -> typing.Iterator['message.base.Base']:
         with READ_LOCK:
             try:
                 db_model = model.QueuedMessage.select()\
-                .where(
-                    model.QueuedMessage.node == node_id,
-                ).order_by(model.QueuedMessage.created_date).get()
+                    .where(
+                        model.QueuedMessage.node == node_id,
+                    ).order_by(model.QueuedMessage.created_date).get()
             except model.QueuedMessage.DoesNotExist:
                 return
             try:

golem/task/server/queue_.py

@@ -17,6 +17,7 @@
 
 logger = logging.getLogger(__name__)
 
+
 class TaskMessagesQueueMixin:
     """Message Queue functionality for TaskServer"""