Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix logging in workers #5729

Merged
merged 12 commits into from
Jul 22, 2019
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -220,16 +220,17 @@ steps:
env:
POSTGRES: "1"
WORKERS: "1"
BLACKLIST: "synapse-blacklist-with-workers"
command:
- "bash .buildkite/merge_base_branch.sh"
- "bash -c 'cat /src/sytest-blacklist /src/.buildkite/worker-blacklist > /src/synapse-blacklist-with-workers'"
- "bash /synapse_sytest.sh"
plugins:
- docker#v3.0.1:
image: "matrixdotorg/sytest-synapse:py35"
propagate-environment: true
always-pull: true
workdir: "/src"
soft_fail: true
retry:
automatic:
- exit_status: -1
Expand Down
28 changes: 28 additions & 0 deletions .buildkite/worker-blacklist
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# This file serves as a blacklist for SyTest tests that we expect will fail in
# Synapse when run under worker mode. For more details, see sytest-blacklist.

Message history can be paginated

m.room.history_visibility == "world_readable" allows/forbids appropriately for Guest users

m.room.history_visibility == "world_readable" allows/forbids appropriately for Real users

Can re-join room if re-invited

/upgrade creates a new room

The only membership state included in an initial sync is for all the senders in the timeline

Local device key changes get to remote servers

If remote user leaves room we no longer receive device updates

Forgotten room messages cannot be paginated

Inbound federation can get public room list

Members from the gap are included in gappy incr LL sync

Leaves are present in non-gapped incremental syncs

Old leaves are present in gapped incremental syncs
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ include demo/demo.tls.dh
include demo/*.py
include demo/*.sh
include sytest-blacklist
include worker-blacklist
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

except it's now under .buildkite ?


recursive-include synapse/storage/schema *.sql
recursive-include synapse/storage/schema *.sql.postgres
Expand Down
1 change: 1 addition & 0 deletions changelog.d/5729.removal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Synapse now no longer accepts the `-v`/`--verbose`, `-f`/`--log-file`, or `--log-config` command line flags, and removes the deprecated `verbose` and `log_file` configuration file options. Users of these options should migrate their options into the dedicated log configuration.
1 change: 1 addition & 0 deletions synapse/config/workers.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ def read_config(self, config, **kwargs):
self.worker_listeners = config.get("worker_listeners", [])
self.worker_daemonize = config.get("worker_daemonize")
self.worker_pid_file = config.get("worker_pid_file")
self.worker_log_config = config.get("worker_log_config")

# The host used to connect to the main synapse
self.worker_replication_host = config.get("worker_replication_host", None)
Expand Down