summary refs log tree commit diff
path: root/synapse/app/homeserver.py (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Remove the legacy v0 content upload API.Mark Haines2016-06-211-2/+1
| | | | | | The existing content can still be downloaded. The last upload to the matrix.org server was in January 2015, so it is probably safe to remove the upload API.
* Add function to load config without generating itMark Haines2016-06-091-2/+1
| | | | | | | | | | | | | | | | Renames ``load_config`` to ``load_or_generate_config`` Adds a method called ``load_config`` that just loads the config. The main synapse.app.homeserver will continue to use ``load_or_generate_config`` to retain backwards compat. However new worker processes can use ``load_config`` to load the config avoiding some of the cruft needed to generate the config. As the new ``load_config`` method is expected to be used by new configs it removes support for the legacy commandline overrides that ``load_or_generate_config`` supports
* Allow setting of gc.set_thresholdsErik Johnston2016-06-071-0/+5
|
* Move the listenTCP call outside the manhole functionMark Haines2016-04-251-7/+9
|
* Split out setting up the manhole to a separate fileMark Haines2016-04-221-26/+7
|
* Merge branch 'develop' into markjh/split_out_site.pyMark Haines2016-04-221-82/+7
|\ | | | | | | | | Conflicts: synapse/app/homeserver.py
| * Split out create_resource_tree to a separate fileMark Haines2016-04-221-82/+7
| |
* | Move SynapseSite to its own fileMark Haines2016-04-221-130/+3
|/
* Move the versionstring code out of app.homeserver into utilMark Haines2016-04-111-83/+4
|
* Don't require config to create databaseErik Johnston2016-04-061-6/+9
|
* Use syntax that works on both py2.7 and py3Mark Haines2016-03-071-1/+1
|
* Merge pull request #571 from matrix-org/daniel/asidsDaniel Wagner-Hall2016-03-031-1/+1
|\ | | | | Mark AS users with their AS's ID
| * Mark AS users with their AS's IDDaniel Wagner-Hall2016-02-111-1/+1
| |
* | Add a /replication API for extracting the updates that happened onMark Haines2016-03-011-0/+4
|/ | | | | | | | | | | | | | | | | | | | | | | | synapse This is necessary for replicating the data in synapse to be visible to a separate service because presence and typing notifications aren't stored in a database so won't be visible to another process. This API can be used to either get the raw data by requesting the tables themselves or to just receive notifications for updates by following the streams meta-stream. Returns updates for each table requested a JSON array of arrays with a row for each row in the table. Each table is prefixed by a header row with the: name of the table, current stream_id position for the table, number of rows, number of columns and the names of the columns. This is followed by the rows that have been added to the server since the requester last asked. The API has a timeout and is hooked up to the notifier so that a slave can long poll for updates.
* Fix up logcontextsErik Johnston2016-02-081-0/+2
|
* Host /media/r0 as well as /media/v1Daniel Wagner-Hall2016-02-051-2/+4
|
* Error if macaroon key is missing from configDaniel Wagner-Hall2016-02-051-5/+15
| | | | | | | | | | | | | Currently we store all access tokens in the DB, and fall back to that check if we can't validate the macaroon, so our fallback works here, but for guests, their macaroons don't get persisted, so we don't get to find them in the database. Each restart, we generate a new ephemeral key, so guests lose access after each server restart. I tried to fix up the config stuff to be less insane, but gave up, so instead I bolt on yet another piece of custom one-off insanity. Also, add some basic tests for config generation and loading.
* Simplify get_roomsErik Johnston2016-02-031-2/+2
|
* Fix flake8 warnings for new flake8Daniel Wagner-Hall2016-02-021-27/+11
|
* Merge pull request #534 from matrix-org/erikj/setupErik Johnston2016-01-281-12/+22
|\ | | | | Add a Homeserver.setup method
| * Clean up a bit. Add commentErik Johnston2016-01-281-6/+7
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setupErik Johnston2016-01-271-1/+1
| |\
| * | Add a Homeserver.setup method.Erik Johnston2016-01-261-12/+21
| | | | | | | | | | | | | | | | | | This is for setting up dependencies that require work on startup. This is useful for the DataStore that wants to read a bunch from the database before initiliazing.
* | | Remove chdirErik Johnston2016-01-281-1/+0
| |/ |/|
* | Don't turn on profilingErik Johnston2016-01-261-1/+1
|/
* Remove redundated BaseHomeServerErik Johnston2016-01-261-89/+48
|
* Use compiled regexErik Johnston2016-01-131-2/+4
|
* Don't log urlencoded access_tokensErik Johnston2016-01-081-2/+2
|
* Turn on core dumpsErik Johnston2016-01-071-2/+5
|
* Merge pull request #473 from matrix-org/erikj/ssh_manholeErik Johnston2016-01-071-5/+21
|\ | | | | Change manhole to use ssh
| * Change manhole to use sshErik Johnston2016-01-071-5/+21
| |
* | copyrightsMatthew Hodgson2016-01-071-1/+1
| |
* | Add /_matrix/versions to report supported versionsDaniel Wagner-Hall2016-01-061-0/+1
| |
* | Log when starting stats reportingDaniel Wagner-Hall2016-01-061-0/+1
| |
* | Log on stats schedulingDaniel Wagner-Hall2016-01-061-0/+1
|/
* Actually host r0 and unstable prefixesDaniel Wagner-Hall2015-12-081-16/+12
|
* Track the time spent in the database per request.Mark Haines2015-12-071-1/+6
| | | | and track the number of transactions that request started.
* Fix warningsMark Haines2015-12-041-1/+11
|
* Run the background updates when starting synapse.Mark Haines2015-11-101-0/+1
|
* Move static folder into synapseErik Johnston2015-10-261-1/+3
| | | | | | | This is because otherwise it won't get picked up by python packaging. This also fixes the problem where the "static" folder was found if synapse wasn't started from that directory.
* Only turn on the twisted deferred debugging if full_twisted_stacktraces is ↵Mark Haines2015-10-131-3/+0
| | | | set in the config
* Bounce all deferreds through the reactor to make debugging easier.Mark Haines2015-10-131-0/+2
| | | | | | If all deferreds wait a reactor tick before resolving then there is always a chance to add an errback to the deferred so that stacktraces get reported, rather than being discarded.
* rename schema_prepare to prepare_databaseErik Johnston2015-10-131-1/+1
|
* Expose error more nicelyErik Johnston2015-10-131-3/+2
|
* Note that GzipFile was removed in comment that referenced itMark Haines2015-09-221-0/+1
|
* synapse/app/homeserver.py:GzipFile was unusedMark Haines2015-09-221-6/+0
|
* Catch stats-reporting errorsDaniel Wagner-Hall2015-09-221-4/+7
|
* Implement configurable stats reportingDaniel Wagner-Hall2015-09-221-1/+34
| | | | | | | | | | SYN-287 This requires that HS owners either opt in or out of stats reporting. When --generate-config is passed, --report-stats must be specified If an already-generated config is used, and doesn't have the report_stats key, it is requested to be set.
* Merge pull request #267 from matrix-org/markjh/missing_requirementsMark Haines2015-09-181-2/+15
|\ | | | | Print an example "pip install" line for a missing requirement
| * Print an example "pip install" line for a missing requirementMark Haines2015-09-011-2/+15
| |
* | Merge branch 'daniel/insecureclient' into developDaniel Wagner-Hall2015-09-091-4/+3
|\ \
| * | Fix random formattingDaniel Wagner-Hall2015-09-091-1/+0
| | |
| * | Allow configuration to ignore invalid SSL certsDaniel Wagner-Hall2015-09-091-4/+4
| |/ | | | | | | | | This will be useful for sytest, and sytest only, hence the aggressive config key name.
* | Merge branch 'master' into developMark Haines2015-09-071-1/+1
|\ \ | |/ |/| | | | | Conflicts: setup.py
| * Change log level to infoErik Johnston2015-09-031-1/+1
| |
* | don't log the whole DB config (including postgres password...)Matthew Hodgson2015-08-291-2/+2
|/
* Print the correct pip install line when failing due to lack of ↵Erik Johnston2015-08-251-3/+4
| | | | matrix-angular-sdk
* Update the log messageErik Johnston2015-08-251-5/+10
|
* Remove dependency on matrix-angular-sdkErik Johnston2015-08-251-1/+8
|
* Allow specifying a directory to host a web client fromErik Johnston2015-08-251-3/+5
|
* Only print the pidfile path on startup if requested by a commandline flagPaul "LeoNerd" Evans2015-08-071-1/+2
|
* Merge pull request #187 from matrix-org/erikj/sanitize_loggingErik Johnston2015-06-191-15/+88
|\ | | | | Sanitize logging
| * Add site_tag to loggerErik Johnston2015-06-191-2/+2
| |
| * Disable twisted access logging. Move access logging to SynapseRequest objectErik Johnston2015-06-151-17/+47
| |
| * Log more when we have processed the requestErik Johnston2015-06-151-2/+8
| |
| * Create SynapseRequest that overrides __repr__ to not print access_tokenErik Johnston2015-06-151-6/+43
| |
* | Make upload dir a configurable path.Eric Myhre2015-06-181-2/+1
|/ | | | | | Fixes SYN-425. Signed-off-by: Eric Myhre <hash@exultant.us>
* Add backwards compat support for metrics, manhole and webclient config optionsErik Johnston2015-06-121-7/+0
|
* PEP8Erik Johnston2015-06-121-3/+3
|
* Correctly handle x_forwaded listener optionErik Johnston2015-06-121-4/+27
|
* Use config.listenersErik Johnston2015-06-121-66/+84
|
* Fix up create_resource_treeErik Johnston2015-06-121-104/+100
|
* Add config option to disable compression of http responsesErik Johnston2015-06-011-2/+8
|
* Add config option to turn off freezing events. Use new encode_json api and ↵Erik Johnston2015-05-291-0/+4
| | | | ujson.loads
* s/metric_interface/metric_bind_host/Erik Johnston2015-05-221-2/+2
|
* Update log lineErik Johnston2015-05-221-1/+4
|
* Enable changing the interface the metrics listener binds toErik Johnston2015-05-221-1/+1
|
* Disable GZip encoding on static file resources as per commentDavid Baker2015-05-191-1/+7
|
* Revert accidental commitErik Johnston2015-05-191-3/+3
|
* SYN-383: Handle the fact the server might not have signed thingsErik Johnston2015-05-191-3/+3
|
* Support gzip encoding for client, client v2 and web client resources (SYN-176).David Baker2015-05-141-5/+16
|
* Optional profiling using cProfileMark Haines2015-05-061-1/+21
|
* Merge branch 'develop' into markjh/config_cleanupMark Haines2015-04-301-3/+36
|\ | | | | | | | | Conflicts: synapse/config/captcha.py
| * Do access log using python's logging stuff, just under a separate logger nameDavid Baker2015-04-301-14/+28
| |
| * Add an access_logDavid Baker2015-04-301-3/+22
| | | | | | | | SYN-161 #resolve
| * Revert previousErik Johnston2015-04-291-5/+1
| |
| * Only start pushers when synapse has fully startedErik Johnston2015-04-291-1/+5
| |
* | remove duplicate parse_size methodMark Haines2015-04-301-1/+0
| |
* | Manually generate the default config yaml, remove most of the commandline ↵Mark Haines2015-04-301-4/+2
|/ | | | arguments for synapse anticipating that people will use the yaml instead. Simpify implementing config options by not requiring the classes to hit the super class
* Fix whitespaceMark Haines2015-04-291-1/+1
|
* Check requirements before doing anything else when running the homeserverMark Haines2015-04-291-1/+4
|
* Merge pull request #129 from matrix-org/key_distributionErik Johnston2015-04-291-1/+7
|\ | | | | Key distribution v2
| * Merge branch 'develop' into key_distributionMark Haines2015-04-291-12/+39
| |\ | | | | | | | | | | | | Conflicts: synapse/config/homeserver.py
| * | Add a version 2 of the key server apiMark Haines2015-04-141-1/+7
| | |
* | | Make postgres database error slightly more helpfulErik Johnston2015-04-291-12/+15
| | |
* | | Check that postgres database has correct charset setErik Johnston2015-04-291-1/+10
| |/ |/|
* | Remove unused importsErik Johnston2015-04-281-2/+1
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-281-1/+20
|\ \
| * | pep8David Baker2015-04-271-1/+0
| | |
| * | Run database check before daemonizing, at the cost of database hygiene.David Baker2015-04-271-9/+8
| | |
| * | rename db method to be more informativeDavid Baker2015-04-271-1/+1
| | |
| * | Check users in our table aren't on a different domain to the one we're ↵David Baker2015-04-241-0/+19
| |/ | | | | | | configured with to try & fix SYN-266
* | Remove unused importErik Johnston2015-04-271-1/+0
| |
* | Move database configuration into config moduleErik Johnston2015-04-271-31/+4
| |
* | Ensure check_same_thread is enabled for sqlite3Erik Johnston2015-04-271-0/+1
| |
* | Remove mysql/maria supportErik Johnston2015-04-151-8/+1
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-151-1/+1
|\|
| * Move server key api into rest/key/v1Mark Haines2015-04-141-1/+1
| |
* | Add support for postgres instead of mysql. Change sql accourdingly. blob + ↵Erik Johnston2015-04-141-0/+2
| | | | | | | | varbinary -> bytea. No support for UNSIGNED or CREATE INDEX IF NOT EXISTS.
* | Use case sensitive collationsErik Johnston2015-04-101-2/+1
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-071-7/+1
|\|
| * PyflakesKegan Dougal2015-03-311-2/+1
| |
| * Remove appservice REST servletsKegan Dougal2015-03-311-5/+0
| |
* | PEP8Erik Johnston2015-04-071-5/+2
| |
* | Explicitly name the __main__ module loggerErik Johnston2015-04-071-1/+1
| |
* | Fix unicode supportErik Johnston2015-04-021-8/+4
| |
* | Fix SQLite supportErik Johnston2015-04-011-3/+12
| |
* | Make work in both Maria and SQLite. Fix testsErik Johnston2015-04-011-7/+13
| |
* | Fix unicode database supportErik Johnston2015-03-251-18/+29
| |
* | Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-03-201-3/+6
|\|
| * Wire up the webclient optionDavid Baker2015-03-171-3/+5
| | | | | | | | | | | | It existed but was hardcoded to True. Give it an underscore for consistency. Also don't pull in syweb unless we're actually using the web client.
* | Make database selection configurableErik Johnston2015-03-201-11/+33
|/
* actually uphold the bind_host parameter. in theory should make ipv6 binds ↵Matthew Hodgson2015-03-141-2/+7
| | | | work like bind_host: 'fe80::1%lo0'
* Option to serve metrics from their own localhost-only TCP port instead of ↵Paul "LeoNerd" Evans2015-03-121-2/+10
| | | | muxed on the main listener
* Fold the slightly-odd bind_port/secure_port/etc.. logic into ↵Paul "LeoNerd" Evans2015-03-121-12/+11
| | | | SynapseHomeServer.start_listening()
* Build MetricsResource as a specific HomeServer dependencyPaul "LeoNerd" Evans2015-03-121-6/+10
|
* A trivial 'hello world'-style resource on /_synapse/metrics, with optional ↵Paul "LeoNerd" Evans2015-03-121-0/+7
| | | | commandline flag
* No need to explicitly pass 'web_client' in to create_resource_tree as it can ↵Paul "LeoNerd" Evans2015-03-121-2/+3
| | | | be found via config
* in_thread takes no argumentsErik Johnston2015-03-101-1/+1
|
* Split out the 'run' from 'setup'Erik Johnston2015-03-101-26/+27
|
* Add documentation. When starting via twistd respect soft_file_limit config ↵Erik Johnston2015-03-101-2/+17
| | | | option.
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perfErik Johnston2015-03-091-28/+133
|\
| * Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-03-061-53/+56
| |\
| | * Don't exit if we can't work out if we're running in a git repoErik Johnston2015-02-211-53/+56
| | |
| * | SYN-67: Finish up implementing new database schema managementErik Johnston2015-03-041-1/+4
| | |
| * | Merge pull request #83 from matrix-org/nofile_limit_configErik Johnston2015-03-021-8/+26
| |\ \ | | | | | | | | Add config option to set the soft fd limit on start
| | * | By default set soft limit to hard limitErik Johnston2015-02-201-2/+6
| | | |
| | * | Rename resource variable so as to not shadow module importErik Johnston2015-02-191-5/+5
| | | |
| | * | Add config option to set the soft fd limit on startErik Johnston2015-02-191-3/+17
| | |/
| * | Trailing commaKegan Dougal2015-02-231-1/+1
| | |
| * | Actually treat this as static content, not random Resources.Kegan Dougal2015-02-231-2/+6
| | |
| * | Add RegisterFallbackResource to /_matrix/static/client/registerKegan Dougal2015-02-231-0/+2
| |/ | | | | | | | | Try to keep both forms of registration logic (native/fallback) close together for sanity.
| * Conform to header spec take twoErik Johnston2015-02-181-1/+1
| |
| * Make version_string conform to User-Agent and Server specErik Johnston2015-02-181-1/+1
| |
| * pyflakesErik Johnston2015-02-181-1/+0
| |
| * When computing git version run git commands in same dir as source filesErik Johnston2015-02-181-0/+5
| |
| * Generate a version string that includes git details if run from git checkoutErik Johnston2015-02-181-1/+61
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2015-02-181-0/+1
| |\
| | * Rename _fail_fetch_pdu_cache to _get_pdu_cacheErik Johnston2015-02-181-1/+1
| | |
| | * Start the get_pdu cacheErik Johnston2015-02-171-0/+1
| | |
| * | Merge branch 'hotfixes-v0.7.0g' of github.com:matrix-org/synapse into developErik Johnston2015-02-171-1/+3
| |\ \ | | |/ | |/|
| | * Don't write bytecodeErik Johnston2015-02-171-1/+3
| | |
| * | Merge pull request #50 from matrix-org/application-servicesMark Haines2015-02-131-1/+6
| |\ \ | | | | | | | | Application Services
| | * \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-111-1/+1
| | |\ \
| | * \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-091-1/+3
| | |\ \ \
| | * \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-021-0/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py
| | * | | | | Add stub application services REST API.Kegan Dougal2015-01-271-1/+6
| | | | | | |
| * | | | | | Prepare the database whenever a connection is opened from the db_pool so ↵Mark Haines2015-02-131-10/+4
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | that in-memory databases will work
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-111-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Fix code-styleMark Haines2015-02-101-1/+1
| | | |_|/ | | |/| |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into state-chacheErik Johnston2015-02-101-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/app/homeserver.py synapse/state.py
| | * | | Time how long we're spending on the database threadErik Johnston2015-02-091-0/+2
| | | | |
| | * | | Log when we receive a request, when we send a response and how long it took ↵Erik Johnston2015-02-091-1/+1
| | | |/ | | |/| | | | | | | | | to process it.
| * / | Bug fixes.Erik Johnston2015-02-061-0/+2
| |/ /
| * | Merge branch 'develop' into pushersDavid Baker2015-01-281-4/+8
| |\| | | | | | | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/server.py
| | * Add client v2_alpha resource to synapse server resource treeMark Haines2015-01-231-1/+6
| | |
| | * Merge rest servlets into the client json resource objectMark Haines2015-01-231-3/+2
| | |
| * | Merge branch 'develop' into pushersDavid Baker2015-01-221-4/+11
| |\| | | | | | | | | | | | | Conflicts: synapse/rest/__init__.py
| | * Move rest APIs back under the rest directoryMark Haines2015-01-221-2/+2
| | |
| * | Merge branch 'develop' into pushersDavid Baker2015-01-131-2/+10
| |\ \
| * \ \ Merge branch 'develop' into pushersDavid Baker2014-12-181-5/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.py
| * \ \ \ Merge branch 'develop' into pushersDavid Baker2014-11-201-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into pushersDavid Baker2014-11-201-3/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'http_client_refactor' into pushersDavid Baker2014-11-201-2/+2
| |\ \ \ \ \ \
| * | | | | | | Start creating a module to do generic notifications (just prints them to ↵David Baker2014-11-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stdout currently!)
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perfErik Johnston2015-01-221-2/+17
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/app/homeserver.py
| * | | | | | | Fix pyflakes errorsMark Haines2015-01-191-1/+1
| | | | | | | |
| * | | | | | | Fix syntaxMark Haines2015-01-191-2/+3
| | | | | | | |
| * | | | | | | Allow ':memory:' as the database path for sqlite3Mark Haines2015-01-191-1/+7
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Check the existance and versions of necessary modules when starting synapse, ↵Mark Haines2015-01-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | log which modules are used
| * | | | | | Log server version on startupErik Johnston2015-01-071-0/+3
| | | | | | |
* | | | | | | Add twisted Service interfaceErik Johnston2015-01-071-3/+18
|/ / / / / /
* | | | | | Merge branch 'master' into developMark Haines2015-01-061-1/+1
|\ \ \ \ \ \
| * | | | | | improve error msgMatthew Hodgson2014-12-241-1/+1
| | |_|_|_|/ | |/| | | |
* / | | | | Update copyright noticesMark Haines2015-01-061-1/+1
|/ / / / /
* | | | | Make failure to run appropraite upgrade scripts more helpful.Erik Johnston2014-12-161-3/+10
| | | | |
* | | | | Get uploads working with new media repoMark Haines2014-12-021-2/+7
| |_|_|/ |/| | |
* | | | Merge branch 'develop' into http_client_refactorDavid Baker2014-11-201-3/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix pep8 codestyle warningsMark Haines2014-11-201-0/+3
| | | |
| * | | Use module loggers rather than the root logger. Exceptions caused by bad ↵Mark Haines2014-11-201-3/+3
| |/ / | | | | | | | | | clients shouldn't cause ERROR level logging. Fix sql logging to use 'repr' rather than 'str'
* | / Separate out the matrix http client completely because just about all of its ↵David Baker2014-11-201-1/+1
| |/ |/| | | | | code it now separate from the simple case we need for standard HTTP(S)
* | Refactor the HTTP clients a little.David Baker2014-11-201-2/+2
|/
* Revert accidental commit of bad fileErik Johnston2014-11-181-37/+24
|
* Fix auth to correctly handle initial creation of roomsErik Johnston2014-11-181-24/+37
|
* Merge branch 'develop' into request_loggingMark Haines2014-11-141-2/+8
|\ | | | | | | | | | | | | Conflicts: setup.py synapse/storage/_base.py synapse/util/async.py
| * Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2014-11-071-1/+4
| |\ | | | | | | | | | federation_authorization
| | * Determine webclient path by the python module it is contained inMark Haines2014-11-041-1/+4
| | |
| * | Add option to not bind to HTTPS port. This is useful if running behind an ↵Erik Johnston2014-11-031-1/+4
| |/ | | | | | | ssl load balancer
* | Remove unused 'context' variables to appease pyflakesMark Haines2014-10-301-2/+2
| |
* | Add a request-id to each log lineMark Haines2014-10-301-2/+10
|/
* Merge branch develop into server2server_signingMark Haines2014-10-131-2/+2
|\ | | | | | | | | Conflicts: synapse/app/homeserver.py
| * Split PlainHttpClient into separate clients for talking to Identity servers ↵Mark Haines2014-10-021-2/+2
| | | | | | | | and talking to Capatcha servers
* | Add a _matrix/key/v1 resource with the verification keys of the local serverMark Haines2014-09-231-2/+8
|/
* prepare_database() on db_conn, not plain name, so we can pass in the ↵Paul "LeoNerd" Evans2014-09-101-1/+9
| | | | connection from outside
* Make sure not to open our TCP ports until /after/ the DB is nicely prepared ↵Paul "LeoNerd" Evans2014-09-101-1/+2
| | | | ready for use
* No need for a tiny run() function any more, just use reactor.run() directlyPaul "LeoNerd" Evans2014-09-101-6/+2
|
* Move database preparing code out of homserver.py into storage where it belongsPaul "LeoNerd" Evans2014-09-101-64/+9
|
* Generate m.room.aliases event when the HS creates a room aliasErik Johnston2014-09-051-1/+1
|
* fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵Matthew Hodgson2014-09-031-1/+1
| | | | hasn't been incorporated in time for launch.
* Store SQL DDL deltas as well; attempt to upgrade the database on startup if ↵Paul "LeoNerd" Evans2014-09-031-7/+15
| | | | it's too old
* Merge branch 'develop' of github.com:matrix-org/synapse into developErik Johnston2014-09-031-1/+2
|\ | | | | | | | | | | Conflicts: synapse/http/server.py synapse/http/content_repository.py
| * move contentrepo class to it's own fileMark Haines2014-09-031-1/+2
| |
* | Add option to change content repo locationErik Johnston2014-09-031-1/+4
|/
* Add ratelimiting function to basehandlerMark Haines2014-09-021-0/+1
|
* Add unsecure listener port to homeserverMark Haines2014-09-011-6/+12
|
* That was a breaking db change. You need to recreate the databases. (In ↵Erik Johnston2014-09-011-1/+1
| | | | reality, it's enough to just run the im.sql through your db and change the schema version)
* Enable SSL for s2s http clientMark Haines2014-09-011-1/+1
|
* Listen using SSLMark Haines2014-09-011-1/+7
|
* Fix homeserver config parsingMark Haines2014-09-011-13/+9
|
* Add config tree to synapse. Add support for reading config from a fileMark Haines2014-08-311-71/+18
|
* Merge branch 'develop' into storage_transactionsMark Haines2014-08-271-20/+45
|\
| * A reliable logger.info() message /after/ the TCP port has been opened and is ↵Paul "LeoNerd" Evans2014-08-271-0/+1
| | | | | | | | listening; this is essential for avoiding races in wrapper scripts e.g. integration testing
| * Use SQLite's PRAGMA user_version to check if the database file really ↵Paul "LeoNerd" Evans2014-08-271-6/+28
| | | | | | | | matches the schema we have in mind
| * Neater database setup at application startup time; only .connect() it once, ↵Paul "LeoNerd" Evans2014-08-271-17/+19
| | | | | | | | not once per schema file; don't build the db_pool twice
* | Remove call to get_federation from homeserverMark Haines2014-08-271-4/+0
|/
* Add the ability to turn on the twisted manhole telnet service.Erik Johnston2014-08-261-0/+10
|
* For the content repo, don't just use homeserver.hostname as that might not ↵Erik Johnston2014-08-241-0/+7
| | | | include the port due to SRV.
* Make the content repo work with in daemon mode. Return the full url on ↵Erik Johnston2014-08-221-2/+3
| | | | upload. Update the webclient to use new content repo api.
* host a webclient by defaultMatthew Hodgson2014-08-211-2/+2
|
* Implemented GETs for the ContentRepoResource. It all actually appears to be ↵Kegan Dougal2014-08-181-2/+2
| | | | working.
* Auth content uploads. Added a mapping function from request > filename. ↵Kegan Dougal2014-08-181-1/+1
| | | | Added exception handling for content uploads. webclient: Only prefix the client API path on doRequest, not doBaseRequest (this would've broken the identity server auth too). Added matrixService.uploadContent. May not require mFileUpload anymore.
* Added /matrix/content path, HS resource_for_content_repo attribute and ↵Kegan Dougal2014-08-181-3/+9
| | | | FileUploadResource. Added stub methods.
* Change relative db paths to absolute paths in case we daemonize.Erik Johnston2014-08-141-2/+9
|
* chmod +x homeserver.pyPaul "LeoNerd" Evans2014-08-141-0/+0
|
* Added web client prefixKegan Dougal2014-08-141-3/+3
|
* Added a urls module for keeping client and federation prefixes.Kegan Dougal2014-08-141-3/+2
|
* If the web client is enabled, automatically redirect root '/' to the web ↵Kegan Dougal2014-08-141-4/+13
| | | | client path.
* Fixed dynamic resource mapping to clobber dummy Resources with the actual ↵Kegan Dougal2014-08-141-5/+27
| | | | desired Resource in the event of a collision (as is the case for '/matrix/client' and '/matrix/client/api/v1')
* Honour the -w flag to enable the web client at /matrix/clientKegan Dougal2014-08-141-5/+8
|
* Removed http_server from HomeServer. Updated unit tests to use either ↵Kegan Dougal2014-08-141-3/+1
| | | | resource_for_federation or resource_for_client depending on what is being tested.
* Make federation use resource_for_federation as well.Kegan Dougal2014-08-141-1/+3
|
* Start phasing out HttpServer: we should be using Resources instead. Added ↵Kegan Dougal2014-08-141-2/+75
| | | | resource_for_client/federation/web_client to the HomeServer and hooked the C-S servlets to operate on resource_for_client. Dynamically construct the Resource tree.
* Don't pass host_web_client flag to register_servlets, it needs to be a ↵Kegan Dougal2014-08-131-1/+1
| | | | Resource not a RestServlet.
* Merge branch 'master' of github.com:matrix-org/synapseKegan Dougal2014-08-131-3/+2
|\
| * Fix logging verbosity parsing codePaul "LeoNerd" Evans2014-08-131-3/+2
| |
* | Merge branch 'master' of github.com:matrix-org/synapseKegan Dougal2014-08-131-3/+3
|\|
| * verbose by default pleaseMatthew Hodgson2014-08-131-3/+3
| |
* | Added a -w flag which will host the web client if specified. Currently this ↵Kegan Dougal2014-08-131-1/+3
|/ | | | just delegates to the webclient RestServlet.
* add in whitespace after copyright statements to improve legibilityMatthew Hodgson2014-08-131-1/+1
|
* Reference Matrix Home Servermatrix.org2014-08-121-0/+172