Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

f1073ad4

Commit f1073ad4 authored 8 years ago by Mark Haines Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #874 from matrix-org/markjh/worker_config

Inline the synchrotron and pusher configs into the main config

parents 486b9a6a a352b68a

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

synapse/app/pusher.py 44 additions, 127 deletions

synapse/app/pusher.py
synapse/app/synchrotron.py 32 additions, 105 deletions

synapse/app/synchrotron.py
synapse/config/homeserver.py 3 additions, 1 deletion

synapse/config/homeserver.py
synapse/config/logger.py 53 additions, 49 deletions

synapse/config/logger.py
synapse/config/server.py 18 additions, 13 deletions

synapse/config/server.py
synapse/config/workers.py 31 additions, 0 deletions

synapse/config/workers.py

with 181 additions and 295 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment