From 6a3743b0d4c9845d3c50b2ab5fa9954647ce5962 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Sun, 12 Feb 2017 09:54:56 +0100 Subject: Use signedjson.sign instead of syutil.crypto.jsonsign Functions from syutil.crypto.jsonsign are now available in signedjson, so use that instead of depending on syutil. Signed-off-by: Andrew Shadura --- contrib/cmdclient/console.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/cmdclient/console.py b/contrib/cmdclient/console.py index 8bb03ce66a..4918fa1a9a 100755 --- a/contrib/cmdclient/console.py +++ b/contrib/cmdclient/console.py @@ -32,7 +32,7 @@ import urlparse import nacl.signing import nacl.encoding -from syutil.crypto.jsonsign import verify_signed_json, SignatureVerifyException +from signedjson.sign import verify_signed_json, SignatureVerifyException CONFIG_JSON = "cmdclient_config.json" -- cgit 1.5.1 From 5aae844e608554bdf5fd4487c729dd978b6eeffc Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 17 Feb 2017 12:48:53 +0000 Subject: Add an example log_config file --- contrib/example_log_config.yaml | 48 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 contrib/example_log_config.yaml (limited to 'contrib') diff --git a/contrib/example_log_config.yaml b/contrib/example_log_config.yaml new file mode 100644 index 0000000000..c582af42d1 --- /dev/null +++ b/contrib/example_log_config.yaml @@ -0,0 +1,48 @@ +# Example log_config file for synapse. To enable, point `log_config` to it in +# `homeserver.yaml`, and restart synapse. +# +# This configuration will produce similar results to the defaults within +# synapse, but can be edited to give more flexibility. + +version: 1 + +formatters: + fmt: + format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s- %(message)s' + +filters: + context: + (): synapse.util.logcontext.LoggingContextFilter + request: "" + +handlers: + # example output to console + console: + class: logging.StreamHandler + filters: [context] + + # example output to file - to enable, edit 'root' config below. + file: + class: logging.handlers.RotatingFileHandler + formatter: fmt + filename: /var/log/synapse/homeserver.log + maxBytes: 100000000 + backupCount: 3 + filters: [context] + + +root: + level: INFO + handlers: [console] # to use file handler instead, switch to [file] + +loggers: + synapse: + level: INFO + + synapse.storage: + level: INFO + + # example of enabling debugging for a component: + # + # synapse.federation.transport.server: + # level: DEBUG \ No newline at end of file -- cgit 1.5.1 From 66eb0bd548afd87f08f7e6e994774fe29589babe Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 17 Feb 2017 12:55:36 +0000 Subject: Update example_log_config.yaml add trailing NL --- contrib/example_log_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/example_log_config.yaml b/contrib/example_log_config.yaml index c582af42d1..7f7c8ba588 100644 --- a/contrib/example_log_config.yaml +++ b/contrib/example_log_config.yaml @@ -45,4 +45,4 @@ loggers: # example of enabling debugging for a component: # # synapse.federation.transport.server: - # level: DEBUG \ No newline at end of file + # level: DEBUG -- cgit 1.5.1 From 9037787f0b655067eb28ae689745e60e7472e7b9 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Tue, 28 Feb 2017 00:29:54 +0000 Subject: merge in right archlinux package, thanks to @saram-kon from https://github.com/matrix-org/synapse/pull/1956 --- contrib/systemd/synapse.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/systemd/synapse.service b/contrib/systemd/synapse.service index 967a4debfd..92d94b9d58 100644 --- a/contrib/systemd/synapse.service +++ b/contrib/systemd/synapse.service @@ -1,5 +1,5 @@ # This assumes that Synapse has been installed as a system package -# (e.g. https://aur.archlinux.org/packages/matrix-synapse/ for ArchLinux) +# (e.g. https://www.archlinux.org/packages/community/any/matrix-synapse/ for ArchLinux) # rather than in a user home directory or similar under virtualenv. [Unit] -- cgit 1.5.1