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

Add systemd-python to optional dependencies #4339

Merged
merged 8 commits into from Apr 16, 2019

Conversation

4 participants
@silkeh
Copy link
Contributor

commented Jan 1, 2019

Using systemd-python allows for logging to the systemd journal, as is documented in: synapse/contrib/systemd/log_config.yaml.

This PR is based on #4325 (will rebase once merged), and adds the package under systemd.

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file
  • Pull request includes a sign off

@silkeh silkeh force-pushed the silkeh:add-systemd-python branch from d5cdf46 to 0659104 Jan 1, 2019

Add systemd-python to optional dependencies
Using systemd-python allows for logging to the systemd journal,
as is documented in: `synapse/contrib/systemd/log_config.yaml`.

Signed-off-by: Silke Hofstra <silke@slxh.eu>

@silkeh silkeh force-pushed the silkeh:add-systemd-python branch from 0659104 to 5c297d5 Jan 10, 2019

@richvdh

This comment has been minimized.

Copy link
Member

commented Jan 11, 2019

This seems reasonable, but the CI is failing with a failure to install systemd-python.

It's not needed to run the unit tests, so I'm wondering if we should change the extras = all config in tox.ini. @hawkowl any thoughts on this?

@richvdh richvdh requested a review from hawkowl Jan 11, 2019

@richvdh richvdh added this to In progress in Homeserver Task Board via automation Mar 19, 2019

@hawkowl

This comment has been minimized.

Copy link
Contributor

commented Mar 26, 2019

@richvdh I think excluding systemd-python from all is probably wise, since you need systemd headers to install it.

@richvdh

This comment has been minimized.

Copy link
Member

commented Mar 26, 2019

@richvdh I think excluding systemd-python from all is probably wise, since you need systemd headers to install it.

Which I think means that you think this PR is incorrect?

@codecov

This comment has been minimized.

Copy link

commented Mar 26, 2019

Codecov Report

Merging #4339 into develop will increase coverage by 0.01%.
The diff coverage is 83.33%.

@@             Coverage Diff             @@
##           develop    #4339      +/-   ##
===========================================
+ Coverage    61.56%   61.57%   +0.01%     
===========================================
  Files          332      332              
  Lines        34270    34271       +1     
  Branches      5650     5651       +1     
===========================================
+ Hits         21097    21103       +6     
+ Misses       11656    11653       -3     
+ Partials      1517     1515       -2
@hawkowl

This comment has been minimized.

Copy link
Contributor

commented Mar 26, 2019

That change there should do -- the branch just needs merging forward.

for opt in CONDITIONAL_REQUIREMENTS.values():
deps = set(opt) | deps
for name, opts in CONDITIONAL_REQUIREMENTS.items():
if name not in ["systemd"]:

This comment has been minimized.

Copy link
@richvdh

richvdh Mar 26, 2019

Member

I'm not sure what the point of including systemd in CONDITIONAL_REQUIREMENTS in the first place is?

This comment has been minimized.

Copy link
@richvdh

richvdh Mar 26, 2019

Member

oh wait, now I do. But I don't think changing this will change the behaviour for [all], which seems to be done in setup.py.

This comment has been minimized.

Copy link
@hawkowl

hawkowl Mar 26, 2019

Contributor

adfghdfh yes of course it won't :/

@anoadragon453

This comment has been minimized.

Copy link
Member

commented Apr 12, 2019

@richvdh @hawkowl What's still needed to change here (other than rebasing the PR)?

hawkowl added some commits Apr 16, 2019

@hawkowl hawkowl merged commit a137f4e into matrix-org:develop Apr 16, 2019

24 checks passed

buildkite/synapse Build #1001 passed (13 minutes, 46 seconds)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 10 seconds)
Details
buildkite/synapse/isort Passed (18 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (16 seconds)
Details
buildkite/synapse/packaging Passed (16 seconds)
Details
buildkite/synapse/pep-8 Passed (54 seconds)
Details
buildkite/synapse/pipeline Passed (3 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-4 Passed (11 minutes, 42 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-postgres-9-dot-5 Passed (11 minutes, 23 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite Passed (6 minutes, 18 seconds)
Details
buildkite/synapse/python-2-dot-7-slash-sqlite-slash-old-deps Passed (7 minutes, 48 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-4 Passed (12 minutes, 37 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (12 minutes, 20 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (7 minutes, 46 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (7 minutes, 3 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (12 minutes, 40 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (12 minutes, 39 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (7 minutes, 2 seconds)
Details
ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
codecov/patch 83.33% of diff hit (target 0%)
Details
codecov/project 61.57% (target 0%)
Details

Homeserver Task Board automation moved this from In progress to Done Apr 16, 2019

@silkeh

This comment has been minimized.

Copy link
Contributor Author

commented Apr 17, 2019

@hawkowl: thanks for picking this up!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.