shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-01-26 10:03:50 +03:00
Code Issues Releases Wiki Activity

Fixed Version number for actor

Browse Source
This commit is contained in:
Adolfo Gómez García 2021-07-08 10:40:56 +02:00
parent 3c5ef5817f
commit 5ba704ac8a
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actor/src/actor_config.py
View File

@ -187,7 +187,7 @@ if __name__ == "__main__":
app = QApplication(sys.argv) app = QApplication(sys.argv)
if udsactor.platform.operations.checkPermissions() is False: if udsactor.platform.operations.checkPermissions() is False:
QMessageBox.critical(None, 'UDS Actor', 'This Program must be executed as administrator', QMessageBox.Ok) QMessageBox.critical(None, 'UDS Actor', 'This Program must be executed as administrator', QMessageBox.Ok) # type: ignore
sys.exit(1) sys.exit(1)
myapp = UDSConfigDialog() myapp = UDSConfigDialog()

1
actor/src/udsactor/info.py
View File

@ -1 +0,0 @@
VERSION = '3.0.0'

2
actor/src/udsactor/rest.py
View File

@ -37,7 +37,7 @@ import typing
import requests import requests
from . import types from . import types
from .info import VERSION from .version import VERSION
# Default public listen port # Default public listen port
LISTEN_PORT = 43910 LISTEN_PORT = 43910

1
actor/src/udsactor/version.py Normal file
View File

@ -0,0 +1 @@
VERSION = '3.5.0'

5
server/src/uds/core/jobs/delayed_task_runner.py
View File

@ -38,7 +38,7 @@ import logging
import typing import typing
from django.db import connections from django.db import connections
from django.db import transaction from django.db import transaction, OperationalError
from django.db.models import Q from django.db.models import Q
from uds.models import DelayedTask as DBDelayedTask from uds.models import DelayedTask as DBDelayedTask
@ -119,6 +119,9 @@ class DelayedTaskRunner:
taskInstance = pickle.loads(taskInstanceDump) taskInstance = pickle.loads(taskInstanceDump)
except IndexError: except IndexError:
return # No problem, there is no waiting delayed task return # No problem, there is no waiting delayed task
except OperationalError:
logger.info('Retrying delayed task')
return
except Exception: except Exception:
# Transaction have been rolled back using the "with atomic", so here just return # Transaction have been rolled back using the "with atomic", so here just return
# Note that is taskInstance can't be loaded, this task will not be run # Note that is taskInstance can't be loaded, this task will not be run