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

Set syslog identifiers #5023

Merged
merged 5 commits into from May 10, 2019

Conversation

Projects
None yet
2 participants
@c7hm4r
Copy link
Contributor

commented Apr 8, 2019

Currently, the log journal of the synapse service contains lines like this:

Apr 08 12:01:39 <hostname> python[30517]: ***** STARTING SERVER *****

It is not obvious that these log lines originated from synapse and the information about the source is lost when logs from multiple services are merged into one log file.

This pull request configures the systemd units to have a log identifier of matrix-synapse
instead of the executable name, python. The logs will then look like this:

Apr 08 12:01:39 <hostname> matrix-synapse[30517]: ***** STARTING SERVER *****

Pull Request Checklist

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

Signed-off-by: Christoph Müller iblzm@hotmail.de

c7hm4r added some commits Apr 8, 2019

@c7hm4r c7hm4r marked this pull request as ready for review Apr 8, 2019

@codecov

This comment has been minimized.

Copy link

commented Apr 17, 2019

Codecov Report

Merging #5023 into develop will increase coverage by 0.44%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop    #5023      +/-   ##
===========================================
+ Coverage    61.06%   61.51%   +0.44%     
===========================================
  Files          336      332       -4     
  Lines        34635    34227     -408     
  Branches      5689     5646      -43     
===========================================
- Hits         21150    21054      -96     
+ Misses       11924    11663     -261     
+ Partials      1561     1510      -51

richvdh added some commits May 9, 2019

@richvdh

richvdh approved these changes May 9, 2019

Copy link
Member

left a comment

looks great, thanks!

@richvdh richvdh merged commit ee90c06 into matrix-org:develop May 10, 2019

4 checks passed

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

anoadragon453 added a commit that referenced this pull request May 10, 2019

Merge branch 'develop' into anoa/blacklist_ip_ranges
* develop: (45 commits)
  URL preview blacklisting fixes (#5155)
  Revert 085ae34
  Add a DUMMY stage to captcha-only registration flow
  Make Prometheus snippet less confusing on the metrics collection doc (#4288)
  Set syslog identifiers in systemd units (#5023)
  Run Black on the tests again (#5170)
  Add AllowEncodedSlashes to apache (#5068)
  remove instructions for jessie installation (#5164)
  Run `black` on per_destination_queue
  Limit the number of EDUs in transactions to 100 as expected by receiver (#5138)
  Fix bogus imports in tests (#5154)
  add options to require an access_token to GET /profile and /publicRooms on CS API (#5083)
  Do checks on aliases for incoming m.room.aliases events (#5128)
  Remove the requirement to authenticate for /admin/server_version. (#5122)
  Fix spelling in server notices admin API docs (#5142)
  Fix sample config
  0.99.3.2
  include disco in deb build target list
  changelog
  Debian: we now need libpq-dev.
  ...

anoadragon453 added a commit that referenced this pull request May 10, 2019

Merge branch 'develop' into anoa/device_list_update_fixes
* develop:
  Revert 085ae34
  Add a DUMMY stage to captcha-only registration flow
  Make Prometheus snippet less confusing on the metrics collection doc (#4288)
  Set syslog identifiers in systemd units (#5023)
  Run Black on the tests again (#5170)
  Add AllowEncodedSlashes to apache (#5068)
  remove instructions for jessie installation (#5164)
  Run `black` on per_destination_queue
  Limit the number of EDUs in transactions to 100 as expected by receiver (#5138)

spantaleev added a commit to spantaleev/matrix-docker-ansible-deploy that referenced this pull request May 16, 2019

Use SyslogIdentifier to improve logging
Reasoning is the same as for matrix-org/synapse#5023.

For us, the journal used to contain `docker` for all services, which
is not very helpful when looking at them all together (`journalctl -f`).
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.