Commit Graph

14486 Commits (965427760bcc68804c098f2edd6663e3d3e24c4e)

Author SHA1 Message Date
Jorik Schellekens 965427760b Typoed 2019-07-02 09:05:05 +01:00
Jorik Schellekens 941b655e40 Neater config retreival 2019-07-02 09:03:42 +01:00
Jorik Schellekens 4bf9e1188f Make opentracing an optional dependency 2019-06-26 19:09:36 +01:00
Jorik Schellekens 37a650c270 Inclue worker name in service_name 2019-06-26 11:24:07 +01:00
Jorik Schellekens 1d591afba4 linting 2019-06-25 18:44:23 +01:00
Jorik Schellekens 34235a45e4 Better opentracing config comment 2019-06-25 18:27:32 +01:00
Jorik Schellekens dde461814d Homeserver Whitlisting 2019-06-25 18:16:48 +01:00
Jorik Schellekens 088176e5b2 Remove debugging brainslip 2019-06-25 17:04:32 +01:00
Jorik Schellekens 04781e93a2 typos 2019-06-25 16:59:37 +01:00
Jorik Schellekens 609d97b8a9 Docstrings! 2019-06-25 16:27:44 +01:00
Jorik Schellekens 810477915f Two errors a "s(c)entry" 2019-06-25 16:21:30 +01:00
Jorik Schellekens 4925558f3f Typo?... 2019-06-25 15:52:32 +01:00
Jorik Schellekens bae63e92f5 Remove debug comment and no need to explicitely record error 2019-06-25 15:50:48 +01:00
Jorik Schellekens 9c39f0e4ad Use tag constants for opentracing. 2019-06-25 15:44:42 +01:00
Jorik Schellekens bae3b5b8fb Use isinstance 2019-06-25 15:34:59 +01:00
Jorik Schellekens dd2f06d4d9 User ConfigError instead of RuntimeError 2019-06-25 15:27:35 +01:00
Jorik Schellekens 0f57aac732 Empty whitelist by default 2019-06-25 15:23:24 +01:00
Jorik Schellekens 640381e881 Remove user whitelisting 2019-06-25 15:23:11 +01:00
Jorik Schellekens e90bfa72fa Rename config to opentracing 2019-06-25 15:14:08 +01:00
Jorik Schellekens 0009fdd3ad Copyright 2019-06-25 14:37:45 +01:00
Jorik Schellekens 8ca185d818 Generate config. 2019-06-25 13:59:52 +01:00
Jorik Schellekens 4e1eaf2b47 Use the new config setup. 2019-06-25 11:03:24 +01:00
Jorik Schellekens db10eeb267 Code style 2019-06-25 10:35:23 +01:00
Jorik Schellekens 889afc11a0 Newsfile 2019-06-25 10:35:23 +01:00
Jorik Schellekens 98c8038bcf Black is the new black 2019-06-25 10:35:23 +01:00
Jorik Schellekens ce21e41359 Merge branch 'develop' into joriks/opentracing
Needed to get black commit because otherwise black
was trying to alter 290ish files.
2019-06-25 09:45:39 +01:00
Jorik Schellekens 6a6f97add9 :Explicitely state that the tracer is disabled 2019-06-25 09:35:19 +01:00
Richard van der Hoff fe2d876e2a Increase default log level for docker image to INFO. (#5547)
Fixes #3370.
2019-06-25 14:38:38 +10:00
Richard van der Hoff f817fc9ad5 Update docker image to use Python 3.7. (#5546)
Python 3.7 is apparently faster than 3.6, and should be mature enough.
2019-06-25 14:20:53 +10:00
Andrew Morgan 28604ab03d
Add info about black to code_style.rst (#5537)
Fixes #5533

Adds information about how to install and run black on the codebase.
2019-06-24 17:48:05 +01:00
Richard van der Hoff 4ac7ef4b67
Merge pull request #5524 from matrix-org/rav/new_cmdline_options
Add --data-dir and --open-private-ports options.
2019-06-24 17:25:57 +01:00
Richard van der Hoff af8a962905
Merge pull request #5523 from matrix-org/rav/arg_defaults
Stop conflating generated config and default config
2019-06-24 17:24:35 +01:00
Richard van der Hoff e59a8cd2e5
Merge pull request #5499 from matrix-org/rav/cleanup_metrics
Cleanups and sanity-checking in cpu and db metrics
2019-06-24 17:12:54 +01:00
Jorik Schellekens a69e6aad77 Set service name 2019-06-24 16:44:47 +01:00
Jorik Schellekens ed5d00f280 bools 2019-06-24 16:44:32 +01:00
Jorik Schellekens ee2f21f09a Remove dependence on jaeger internals 2019-06-24 16:42:39 +01:00
Jorik Schellekens 37607eb5ad typo 2019-06-24 16:19:16 +01:00
Jorik Schellekens 7d9c3d341f Disable tracer if not configured 2019-06-24 16:13:46 +01:00
Brendan Abolivier deb4fe6ef3
Merge pull request #5534 from matrix-org/babolivier/federation-publicrooms
Split public rooms directory auth config in two
2019-06-24 16:08:02 +01:00
Jorik Schellekens f35bde3892 Remove scope from logcontext if logcontext is top level 2019-06-24 16:01:33 +01:00
Brendan Abolivier bfe84e051e Split public rooms directory auth config in two 2019-06-24 15:42:31 +01:00
Erik Johnston 25433f212d
Merge pull request #5531 from matrix-org/erikj/workers_pagination_token
Fix /messages on workers when no from param specified.
2019-06-24 15:30:10 +01:00
Richard van der Hoff e6b2ccbb51 changelog 2019-06-24 14:15:34 +01:00
Richard van der Hoff 3f8a252dd8 Add "--open-private-ports" cmdline option
This is helpful when generating a config file for running synapse under docker.
2019-06-24 14:15:34 +01:00
Richard van der Hoff 6a92b06cbb Add --data-directory commandline argument
We don't necessarily want to put the data in the cwd.
2019-06-24 14:15:34 +01:00
Richard van der Hoff c783294549 changelog 2019-06-24 14:14:52 +01:00
Richard van der Hoff 16b52642e2 Don't load the generated config as the default.
It's too confusing.
2019-06-24 14:14:52 +01:00
Richard van der Hoff 7c2f8881a9 Ensure that all config options have sensible defaults
This will enable us to skip the unintuitive behaviour where the generated
config and default config are the same thing.
2019-06-24 14:14:52 +01:00
Richard van der Hoff cf7aef1114
Merge pull request #5516 from matrix-org/rav/acme_key_path
Allow configuration of the path used for ACME account keys.
2019-06-24 14:14:20 +01:00
Richard van der Hoff 5d9c101551 changelog 2019-06-24 13:51:22 +01:00