summary refs log tree commit diff
path: root/synapse/app (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * 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
| |
* | Merge branch 'develop' into pushersDavid Baker2015-01-133-4/+12
|\|
| * 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
| |
| * Merge branch 'master' into developMark Haines2015-01-061-1/+1
| |\
| | * improve error msgMatthew Hodgson2014-12-241-1/+1
| | |
| * | Update copyright noticesMark Haines2015-01-063-3/+3
| |/
* | Merge branch 'develop' into pushersDavid Baker2014-12-181-5/+17
|\| | | | | | | | | | | | | Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.py
| * 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 pushersDavid Baker2014-11-201-1/+1
|\|
| * Merge branch 'develop' into http_client_refactorDavid Baker2014-11-202-8/+15
| |\
| * | 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)
* | | Merge branch 'develop' into pushersDavid Baker2014-11-202-8/+15
|\ \ \ | | |/ | |/|
| * | Fix pep8 codestyle warningsMark Haines2014-11-202-5/+12
| | |
| * | 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'
* | | Merge branch 'http_client_refactor' into pushersDavid Baker2014-11-201-2/+2
|\ \ \ | | |/ | |/|
| * | Refactor the HTTP clients a little.David 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!)
* 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
|
* Stop before starting when restartingMark Haines2014-11-171-1/+1
|
* Merge branch 'develop' into request_loggingMark Haines2014-11-142-2/+74
|\ | | | | | | | | | | | | Conflicts: setup.py synapse/storage/_base.py synapse/util/async.py
| * SYN-138: Rewrite synctl in python and include it in the python distributionMark Haines2014-11-131-0/+66
| |
| * 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
| |
* | Merge branch 'develop' into request_loggingMark Haines2014-10-301-1/+0
|\| | | | | | | | | Conflicts: synapse/config/logger.py
| * Fix pep8 warningsMark Haines2014-10-301-1/+0
| |
* | 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-032-2/+2
| | | | 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-132-1/+2
|
* Reference Matrix Home Servermatrix.org2014-08-122-0/+186