diff options
| author | Andrej Shadura <andrewsh@debian.org> | 2020-08-12 09:05:10 +0200 |
|---|---|---|
| committer | Andrej Shadura <andrewsh@debian.org> | 2020-08-12 09:05:10 +0200 |
| commit | e59dea7b4cbe3528d78b694713505a5da00996b1 (patch) | |
| tree | 4b0adbc710f5bdf2260fe3ea925dfd9d53cc0d56 /synapse/config/push.py | |
| parent | 16f1d7d5fb08f51a3547391873b481d40b4b8c92 (diff) | |
New upstream version 1.18.0
Diffstat (limited to 'synapse/config/push.py')
| -rw-r--r-- | synapse/config/push.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/config/push.py b/synapse/config/push.py index 6f2b3a7f..a1f3752c 100644 --- a/synapse/config/push.py +++ b/synapse/config/push.py @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from ._base import Config +from ._base import Config, ShardedWorkerHandlingConfig class PushConfig(Config): @@ -24,6 +24,9 @@ class PushConfig(Config): push_config = config.get("push", {}) self.push_include_content = push_config.get("include_content", True) + pusher_instances = config.get("pusher_instances") or [] + self.pusher_shard_config = ShardedWorkerHandlingConfig(pusher_instances) + # There was a a 'redact_content' setting but mistakenly read from the # 'email'section'. Check for the flag in the 'push' section, and log, # but do not honour it to avoid nasty surprises when people upgrade. |