Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automate generation of the sample and debian log configs #6627

Merged
merged 1 commit into from Jan 3, 2020

Conversation

@richvdh
Copy link
Member

richvdh commented Jan 3, 2020

Currently we have a couple of manually-generated files in the repo:

These are prone to getting out of sync with the latest best practice, so let's solve that:

  • for the sample_log_config, create a script which will generate it from the embedded config, and add stuff to CI to check it is up-to-date (in the same way that we do with sample_config)
  • for the debian config, generate it on-the-fly during package building.

(It might be worth noting that the docker image has its own default log file (https://github.com/matrix-org/synapse/blob/master/docker/conf/log.config), but that deliberately has different settings to the stock configs so I think it's ok for it to be separate.)

@richvdh richvdh requested a review from matrix-org/synapse-core Jan 3, 2020
@richvdh richvdh force-pushed the rav/sane_log_config branch from e3e97b0 to 43cd3c7 Jan 3, 2020
Copy link
Member

babolivier left a comment

lgtm

@richvdh richvdh merged commit 0881556 into develop Jan 3, 2020
22 checks passed
22 checks passed
buildkite/synapse Build #6298 passed (15 minutes, 11 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 34 seconds)
Details
buildkite/synapse/check-style Passed (1 minute, 37 seconds)
Details
buildkite/synapse/isort Passed (16 seconds)
Details
buildkite/synapse/mypy Passed (29 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (13 seconds)
Details
buildkite/synapse/packaging Passed (16 seconds)
Details
buildkite/synapse/pipeline Passed (3 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (10 minutes, 40 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (6 minutes, 43 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite-slash-old-deps Passed (7 minutes, 17 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (6 minutes, 20 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (9 minutes, 54 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (9 minutes, 52 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (6 minutes, 18 seconds)
Details
buildkite/synapse/synapse-port-db-slash-python-3-dot-5-slash-postgres-9-dot-5 Passed (1 minute, 3 seconds)
Details
buildkite/synapse/synapse-port-db-slash-python-3-dot-7-slash-postgres-11 Passed (1 minute, 5 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-monolith Passed (11 minutes, 9 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-workers Passed (12 minutes, 32 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-sqlite-slash-monolith Passed (10 minutes, 34 seconds)
Details
buildkite/synapse/sytest-python-3-dot-7-slash-postgres-11-slash-monolith Passed (9 minutes, 49 seconds)
Details
buildkite/synapse/sytest-python-3-dot-7-slash-postgres-11-slash-workers Passed (11 minutes, 51 seconds)
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.