summary refs log tree commit diff
path: root/synapse/config/push.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-02-26 14:05:40 +0000
committerRichard van der Hoff <richard@matrix.org>2021-02-26 14:05:40 +0000
commitfdbccc1e74c56da19bffc33bfe4f9f8d2b2d26f8 (patch)
tree4e2e1bdc58f6f77d7856e56261ace9b0218bb9f6 /synapse/config/push.py
parentRevert "Redirect redirect requests if they arrive on the wrong URI" (diff)
parentSSO: redirect to public URL before setting cookies (#9436) (diff)
downloadsynapse-fdbccc1e74c56da19bffc33bfe4f9f8d2b2d26f8.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/push.py')
-rw-r--r--synapse/config/push.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/config/push.py b/synapse/config/push.py
index 3adbfb73e6..7831a2ef79 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, ShardedWorkerHandlingConfig
+from ._base import Config
 
 
 class PushConfig(Config):
@@ -27,9 +27,6 @@ class PushConfig(Config):
             "group_unread_count_by_room", 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.