matrix-org
diff --git a/‎CHANGES.md
+82 b/‎CHANGES.md
+82
diff --git a/‎INSTALL.md
+5-16 b/‎INSTALL.md
+5-16
diff --git a/‎changelog.d/4339.feature
-1 b/‎changelog.d/4339.feature
-1
diff --git a/‎changelog.d/4474.misc
-1 b/‎changelog.d/4474.misc
-1
diff --git a/‎changelog.d/4555.bugfix
-1 b/‎changelog.d/4555.bugfix
-1
diff --git a/‎changelog.d/4867.feature
-1 b/‎changelog.d/4867.feature
-1
diff --git a/‎changelog.d/4942.bugfix
-1 b/‎changelog.d/4942.bugfix
-1
diff --git a/‎changelog.d/4947.feature
-1 b/‎changelog.d/4947.feature
-1
diff --git a/‎changelog.d/4949.misc
-1 b/‎changelog.d/4949.misc
-1
diff --git a/‎changelog.d/4953.misc
-2 b/‎changelog.d/4953.misc
-2
diff --git a/‎changelog.d/4954.misc
-1 b/‎changelog.d/4954.misc
-1
diff --git a/‎changelog.d/4955.bugfix
-1 b/‎changelog.d/4955.bugfix
-1
diff --git a/‎changelog.d/4956.bugfix
-1 b/‎changelog.d/4956.bugfix
-1
diff --git a/‎changelog.d/4959.misc
-1 b/‎changelog.d/4959.misc
-1
diff --git a/‎changelog.d/4965.misc
-1 b/‎changelog.d/4965.misc
-1
diff --git a/‎changelog.d/4967.feature
-1 b/‎changelog.d/4967.feature
-1
diff --git a/‎changelog.d/4968.misc
-1 b/‎changelog.d/4968.misc
-1
diff --git a/‎changelog.d/4969.misc
-2 b/‎changelog.d/4969.misc
-2
diff --git a/‎changelog.d/4972.misc
-1 b/‎changelog.d/4972.misc
-1
diff --git a/‎changelog.d/4974.misc
-1 b/‎changelog.d/4974.misc
-1
diff --git a/‎changelog.d/4981.bugfix
-1 b/‎changelog.d/4981.bugfix
-1
diff --git a/‎changelog.d/4982.misc
-1 b/‎changelog.d/4982.misc
-1
diff --git a/‎changelog.d/4985.misc
-1 b/‎changelog.d/4985.misc
-1
diff --git a/‎changelog.d/4987.misc
-1 b/‎changelog.d/4987.misc
-1
diff --git a/‎changelog.d/4989.feature
-1 b/‎changelog.d/4989.feature
-1
diff --git a/‎changelog.d/4990.bugfix
-1 b/‎changelog.d/4990.bugfix
-1
diff --git a/‎changelog.d/4991.feature
-1 b/‎changelog.d/4991.feature
-1
diff --git a/‎changelog.d/4992.misc
-1 b/‎changelog.d/4992.misc
-1
diff --git a/‎changelog.d/4996.misc
-1 b/‎changelog.d/4996.misc
-1
diff --git a/‎changelog.d/4998.misc
-1 b/‎changelog.d/4998.misc
-1
diff --git a/‎changelog.d/4999.bugfix
-1 b/‎changelog.d/4999.bugfix
-1
diff --git a/‎changelog.d/5001.misc
-1 b/‎changelog.d/5001.misc
-1
diff --git a/‎changelog.d/5002.feature
-1 b/‎changelog.d/5002.feature
-1
diff --git a/‎changelog.d/5003.bugfix
-1 b/‎changelog.d/5003.bugfix
-1
diff --git a/‎changelog.d/5005.misc
-1 b/‎changelog.d/5005.misc
-1
diff --git a/‎changelog.d/5007.misc
-1 b/‎changelog.d/5007.misc
-1
diff --git a/‎changelog.d/5009.bugfix
-1 b/‎changelog.d/5009.bugfix
-1
diff --git a/‎changelog.d/5010.feature
-1 b/‎changelog.d/5010.feature
-1
diff --git a/‎changelog.d/5020.feature
-1 b/‎changelog.d/5020.feature
-1
diff --git a/‎changelog.d/5024.misc
-1 b/‎changelog.d/5024.misc
-1
diff --git a/‎changelog.d/5027.feature
-1 b/‎changelog.d/5027.feature
-1
diff --git a/‎changelog.d/5028.misc
-1 b/‎changelog.d/5028.misc
-1
diff --git a/‎changelog.d/5030.misc
-1 b/‎changelog.d/5030.misc
-1
diff --git a/‎changelog.d/5032.bugfix
-1 b/‎changelog.d/5032.bugfix
-1
diff --git a/‎changelog.d/5033.misc
-1 b/‎changelog.d/5033.misc
-1
diff --git a/‎changelog.d/5035.bugfix
-1 b/‎changelog.d/5035.bugfix
-1
diff --git a/‎changelog.d/5037.bugfix
-1 b/‎changelog.d/5037.bugfix
-1
diff --git a/‎changelog.d/5043.feature
+1 b/‎changelog.d/5043.feature
+1
diff --git a/‎changelog.d/5046.misc
-1 b/‎changelog.d/5046.misc
-1
diff --git a/‎changelog.d/5047.feature
-1 b/‎changelog.d/5047.feature
-1
diff --git a/‎changelog.d/5063.feature
-1 b/‎changelog.d/5063.feature
-1
diff --git a/‎changelog.d/5065.feature
-1 b/‎changelog.d/5065.feature
-1
diff --git a/‎changelog.d/5067.misc
-1 b/‎changelog.d/5067.misc
-1
diff --git a/‎changelog.d/5070.feature
-1 b/‎changelog.d/5070.feature
-1
diff --git a/‎changelog.d/5071.bugfix
-1 b/‎changelog.d/5071.bugfix
-1
diff --git a/‎changelog.d/5073.feature
-1 b/‎changelog.d/5073.feature
-1
diff --git a/‎changelog.d/5077.bugfix
-1 b/‎changelog.d/5077.bugfix
-1
diff --git a/‎changelog.d/5083.feature
-1 b/‎changelog.d/5083.feature
-1
diff --git a/‎changelog.d/5098.misc
-1 b/‎changelog.d/5098.misc
-1
diff --git a/‎changelog.d/5100.misc
-1 b/‎changelog.d/5100.misc
-1
diff --git a/‎changelog.d/5103.bugfix
-1 b/‎changelog.d/5103.bugfix
-1
diff --git a/‎changelog.d/5104.bugfix
-1 b/‎changelog.d/5104.bugfix
-1
diff --git a/‎changelog.d/5116.feature
-1 b/‎changelog.d/5116.feature
-1
diff --git a/‎changelog.d/5119.feature
-1 b/‎changelog.d/5119.feature
-1
diff --git a/‎changelog.d/5120.misc
-1 b/‎changelog.d/5120.misc
-1
diff --git a/‎changelog.d/5121.feature
-1 b/‎changelog.d/5121.feature
-1
diff --git a/‎changelog.d/5122.misc
-1 b/‎changelog.d/5122.misc
-1
diff --git a/‎changelog.d/5124.bugfix
-1 b/‎changelog.d/5124.bugfix
-1
diff --git a/‎changelog.d/5128.bugfix
-1 b/‎changelog.d/5128.bugfix
-1
diff --git a/‎changelog.d/5142.feature
-1 b/‎changelog.d/5142.feature
-1
diff --git a/‎changelog.d/5154.bugfix
-1 b/‎changelog.d/5154.bugfix
-1
diff --git a/‎changelog.d/5171.misc
+1 b/‎changelog.d/5171.misc
+1
diff --git a/‎contrib/systemd-with-workers/system/[email protected]
+1 b/‎contrib/systemd-with-workers/system/[email protected]
+1
diff --git a/‎contrib/systemd-with-workers/system/matrix-synapse.service
+1 b/‎contrib/systemd-with-workers/system/matrix-synapse.service
+1
diff --git a/‎contrib/systemd/matrix-synapse.service
+1-1 b/‎contrib/systemd/matrix-synapse.service
+1-1
diff --git a/‎debian/changelog
+7 b/‎debian/changelog
+7
diff --git a/‎debian/matrix-synapse.service
+1 b/‎debian/matrix-synapse.service
+1
diff --git a/‎docs/metrics-howto.rst
+4-1 b/‎docs/metrics-howto.rst
+4-1
@@ -0,0 +1 @@
+Add ability to blacklist IP ranges for the federation client.
@@ -0,0 +1 @@
+Update tests to consistently be configured via the same code that is used when loading from configuration files.
@@ -12,6 +12,7 @@ ExecStart=/opt/venvs/matrix-synapse/bin/python -m synapse.app.%i --config-path=/
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=always
 RestartSec=3
+SyslogIdentifier=matrix-synapse-%i
 
 [Install]
 WantedBy=matrix-synapse.service
@@ -11,6 +11,7 @@ ExecStart=/opt/venvs/matrix-synapse/bin/python -m synapse.app.homeserver --confi
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=always
 RestartSec=3
+SyslogIdentifier=matrix-synapse
 
 [Install]
 WantedBy=matrix.target
@@ -22,10 +22,10 @@ Group=nogroup
 
 WorkingDirectory=/opt/synapse
 ExecStart=/opt/synapse/env/bin/python -m synapse.app.homeserver --config-path=/opt/synapse/homeserver.yaml
+SyslogIdentifier=matrix-synapse
 
 # adjust the cache factor if necessary
 # Environment=SYNAPSE_CACHE_FACTOR=2.0
 
 [Install]
 WantedBy=multi-user.target
-
@@ -1,3 +1,10 @@
+matrix-synapse-py3 (0.99.3.2+nmu1) UNRELEASED; urgency=medium
+
+  [ Christoph Müller ]
+  * Configure the systemd units to have a log identifier of `matrix-synapse`
+
+ -- Christoph Müller <[email protected]>  Wed, 17 Apr 2019 16:17:32 +0200
+
 matrix-synapse-py3 (0.99.3.2) stable; urgency=medium
 
   * New synapse release 0.99.3.2.
 
@@ -11,6 +11,7 @@ ExecStart=/opt/venvs/matrix-synapse/bin/python -m synapse.app.homeserver --confi
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=always
 RestartSec=3
+SyslogIdentifier=matrix-synapse
 
 [Install]
 WantedBy=multi-user.target
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Add ability to blacklist IP ranges for the federation client.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Update tests to consistently be configured via the same code that is used when loading from configuration files.`