diff options
author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-09-25 11:50:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-25 11:50:11 +0100 |
commit | 94133d7ce8ab8dca8b8f47c0f2666d59486884a5 (patch) | |
tree | d472d3d5530e45eee0c156a0446bf42da0a81288 /synapse/config/workers.py | |
parent | Fix iteration of requests_missing_keys; list doesn't have .values() (diff) | |
parent | Fix logcontxt leak in keyclient (#2465) (diff) | |
download | synapse-94133d7ce8ab8dca8b8f47c0f2666d59486884a5.tar.xz |
Merge branch 'develop' into develop
Diffstat (limited to 'synapse/config/workers.py')
-rw-r--r-- | synapse/config/workers.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/config/workers.py b/synapse/config/workers.py index 99d5d8aaeb..c5a5a8919c 100644 --- a/synapse/config/workers.py +++ b/synapse/config/workers.py @@ -33,6 +33,7 @@ class WorkerConfig(Config): self.worker_name = config.get("worker_name", self.worker_app) self.worker_main_http_uri = config.get("worker_main_http_uri", None) + self.worker_cpu_affinity = config.get("worker_cpu_affinity") if self.worker_listeners: for listener in self.worker_listeners: |