summary refs log tree commit diff
path: root/synapse/app (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1162 from larroy/masterErik Johnston2016-10-141-1/+1
|\ | | | | Use sys.executable instead of hardcoded python. fixes #1161
| * Use sys.executable instead of hardcoded python. fixes #1161Pedro Larroy2016-10-081-1/+1
| |
* | Reduce DB hits for replicationErik Johnston2016-09-231-2/+2
|/ | | | | | | | | | | | | | Some streams will occaisonally advance their positions without actually having any new rows to send over federation. Currently this means that the token will not advance on the workers, leading to them repeatedly sending a slightly out of date token. This in turns requires the master to hit the DB to check if there are any new rows, rather than hitting the no op logic where we check if the given token matches the current token. This commit changes the API to always return an entry if the position for a stream has changed, allowing workers to advance their tokens correctly.
* Support /initialSync in synchrotron workerErik Johnston2016-09-211-0/+6
|
* fix logger for client_reader workerMatthew Hodgson2016-09-171-1/+1
|
* Enable state caches on workersErik Johnston2016-09-156-0/+6
|
* Split out public room list into a worker processErik Johnston2016-09-141-0/+215
|
* CommentErik Johnston2016-09-091-0/+3
|
* Fix up the calls to the notifier for device messagesMark Haines2016-09-011-0/+3
|
* Add new direct message storage functions to slave storeErik Johnston2016-08-301-0/+2
|
* Update commentMark Haines2016-08-221-1/+2
|
* Add usage stats to prometheus monitoringMark Haines2016-08-221-2/+25
|
* Remove log linesErik Johnston2016-08-181-2/+0
|
* Add appservice workerErik Johnston2016-08-181-0/+211
|
* Missed a s/federation reader/media repository/ in a log messageMark Haines2016-08-181-1/+1
|
* Add a media repository workerMark Haines2016-08-181-0/+212
|
* Remove broken cache stuffErik Johnston2016-08-152-21/+0
|
* Implement cache replication streamErik Johnston2016-08-151-13/+0
|
* Make synchrotron accept /eventsErik Johnston2016-08-121-2/+34
|
* Synced up synchrotron set_state with PresenceHandler set_stateWill Hunt2016-08-111-1/+1
|
* Add federation /version APIErik Johnston2016-08-054-4/+4
|
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_readerErik Johnston2016-07-291-5/+3
|\
| * Fix flake8 violationRichard van der Hoff2016-07-261-5/+3
| | | | | | | | | | Apparently flake8 v3 puts the error on a different line to v2. Easiest way to make sure that happens is by putting the whole statement on one line :)
* | Add destination retry to slave storeErik Johnston2016-07-281-0/+2
| |
* | Add slace storage functions for public room listErik Johnston2016-07-281-0/+4
| |
* | Split out a FederationReader processErik Johnston2016-07-211-0/+200
|/
* Add metrics for psutil derived memory usageErik Johnston2016-07-201-0/+3
|
* Merge branch 'master' into developMark Haines2016-06-231-27/+151
|\
| * Optionally start or stop workers in synctl.Mark Haines2016-06-211-27/+151
| | | | | | | | | | | | | | | | | | | | | | Optionally start or stop an individual worker by passing -w with the path to the worker config. Optionally start or stop every worker and the main synapse by passing -a with a path to a directory containing worker configs. The "-w" is intended to be used to bounce individual workers proceses. THe "-a" is intended for when you want to restart all the workers simultaneuously, for example when performing database upgrades.
* | 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.
* Fix setting gc thresholds in the workersMark Haines2016-06-172-2/+4
|
* Use worker_ prefixes for worker config, use existing support for multiple ↵Mark Haines2016-06-162-34/+24
| | | | config files
* Access the event_cache_size directly from the server object.Mark Haines2016-06-162-6/+6
| | | | | This means that the workers can override the event_cache_size directly without clobbering the value in the main synapse config.
* Access replication_url from the worker config directlyMark Haines2016-06-162-4/+6
|
* Inline the synchrotron and pusher configs into the main configMark Haines2016-06-162-228/+80
|
* 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
* Add gc_threshold to pusher and synchrotronErik Johnston2016-06-072-0/+28
|
* Allow setting of gc.set_thresholdsErik Johnston2016-06-073-5/+20
|
* Merge pull request #845 from matrix-org/markjh/synchrotron_presenceMark Haines2016-06-061-1/+4
|\ | | | | Fix a KeyError in the synchrotron presence
| * Fix a KeyError in the synchrotron presenceMark Haines2016-06-061-1/+4
| |
* | Yield on the sleeps intended to backoff replicationMark Haines2016-06-062-2/+2
|/
* Fix spellingMark Haines2016-06-031-1/+1
|
* Add get_presence_list_accepted to the broken caches in synchrotronMark Haines2016-06-031-4/+9
|
* Clear the list of ongoing syncs on shutdownMark Haines2016-06-031-0/+9
|
* Appease flake8Mark Haines2016-06-031-1/+1
|
* Use ClientIpStore to record client ipsMark Haines2016-06-031-3/+4
|
* Send updates to the syncing users every ten seconds or immediately if ↵Mark Haines2016-06-031-10/+43
| | | | they've just come online
* Add a separate process that can handle /sync requestsMark Haines2016-06-031-0/+467
|
* Working unsubscribe links going straight to the HSDavid Baker2016-06-021-1/+22
| | | | and authed by macaroons that let you delete pushers and nothing else
* os.environ requires a stringErik Johnston2016-05-161-1/+1
|
* Make synctl read a cache factor from config fileErik Johnston2016-05-161-0/+4
|
* Manually expire broken caches like the who_forgot_in_roomMark Haines2016-05-131-0/+16
|
* Use the SlavedAccountDataStoreMark Haines2016-05-131-10/+3
|
* Shift some of the state_group methods into the SlavedEventStoreMark Haines2016-05-131-45/+0
|
* Make email notifs work on the pusher synapseDavid Baker2016-05-131-0/+47
| | | | Plus general bugfix to email notif code
* Pass through _get_state_group_for_eventsDavid Baker2016-05-101-0/+4
|
* StateStore, not EventsStoreDavid Baker2016-05-101-2/+2
|
* Cached functions must be accessed through the dictDavid Baker2016-05-101-1/+2
|
* Pass though _get_state_group_for_eventsDavid Baker2016-05-101-0/+4
|
* Pass through get_state_groupsDavid Baker2016-05-101-0/+4
|
* Also pass through get_profile_displaynameDavid Baker2016-05-101-0/+4
|
* Add date header & message idDavid Baker2016-05-041-1/+2
|
* Add db functions used for email to the pusher appDavid Baker2016-05-041-0/+12
|
* Actually start the pusher daemonMark Haines2016-04-261-0/+2
|
* Fix typo in default pusher configMark Haines2016-04-261-1/+1
|
* Add a log context to the daemonized pusherMark Haines2016-04-261-1/+6
|
* Optionally daemonize the pusherMark Haines2016-04-261-4/+31
|
* Add a couple of update methods to the PusherSlaveStoreMark Haines2016-04-261-0/+8
|
* Remove the uncomments from the commentsMark Haines2016-04-251-2/+2
|
* Add a metrics listener and a ssh listener to the pusherMark Haines2016-04-251-2/+67
|
* 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
|/
* Optionally split out the pushers into a separate processMark Haines2016-04-211-0/+208
|
* 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-072-4/+4
|
* 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-022-27/+30
|
* 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-073-3/+3
| |
* | 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
|
* Don't change cwd in synctlErik Johnston2015-10-011-2/+2
|
* Merge pull request #288 from matrix-org/markjh/unused_definitionsMark Haines2015-09-281-6/+1
|\ | | | | Remove some of the unused definitions from synapse
| * 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
| |
* | Fix restartDaniel Wagner-Hall2015-09-241-2/+2
| |
* | Allow config file path to be configurable in in synctlDaniel Wagner-Hall2015-09-241-24/+26
|/ | | | Also, allow it to be run from directories other than the synapse directory
* Catch stats-reporting errorsDaniel Wagner-Hall2015-09-221-4/+7
|
* Implement configurable stats reportingDaniel Wagner-Hall2015-09-222-3/+44
| | | | | | | | | | 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
|
* Don't read from the config file before checking it existsMark Haines2015-05-061-9/+10
|
* missing importMark Haines2015-04-301-0/+2
|
* read the pid_file from the config file in synctlMark Haines2015-04-301-2/+3
|
* 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-092-29/+134
|\
| * 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-172-2/+4
| |\ \ | | |/ | |/|
| | * Don't write bytecodeErik Johnston2015-02-172-2/+4
| | |
| * | 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-133-4/+12
| |\ \
| * \ \ 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-202-8/+15
| |\ \ \ \ \
| * \ \ \ \ \ 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!)