diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | changelog.d/8544.feature | 1 | ||||
-rw-r--r-- | changelog.d/8566.misc | 1 | ||||
-rw-r--r-- | synapse/storage/databases/main/events_worker.py | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index af36c00cfa..9bb5bdd647 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ _trial_temp*/ /.python-version /*.signing.key /env/ +/.venv*/ /homeserver*.yaml /logs /media_store/ diff --git a/changelog.d/8544.feature b/changelog.d/8544.feature new file mode 100644 index 0000000000..542993110b --- /dev/null +++ b/changelog.d/8544.feature @@ -0,0 +1 @@ +Allow running background tasks in a separate worker process. diff --git a/changelog.d/8566.misc b/changelog.d/8566.misc new file mode 100644 index 0000000000..453cf48ffa --- /dev/null +++ b/changelog.d/8566.misc @@ -0,0 +1 @@ +Add virtualenv-generated folders to `.gitignore`. \ No newline at end of file diff --git a/synapse/storage/databases/main/events_worker.py b/synapse/storage/databases/main/events_worker.py index ff150f0be7..0ad9a19b3d 100644 --- a/synapse/storage/databases/main/events_worker.py +++ b/synapse/storage/databases/main/events_worker.py @@ -137,7 +137,7 @@ class EventsWorkerStore(SQLBaseStore): db_conn, "events", "stream_ordering", step=-1 ) - if not hs.config.worker.worker_app: + if hs.config.run_background_tasks: # We periodically clean out old transaction ID mappings self._clock.looping_call( run_as_background_process, |