6282 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnston	96d9d5d388	Merge pull request #767 from matrix-org/erikj/transaction_txn ... Reduce database inserts when sending transactions	2016-05-06 13:20:43 +01:00
Erik Johnston	d13459636f	Pull prev txn from in memory	2016-05-06 11:30:55 +01:00
Erik Johnston	1d275dba69	Don't needlessly enter transaction	2016-05-06 11:25:58 +01:00
Erik Johnston	56b5e83e36	Reduce database inserts when sending transactions	2016-05-06 11:20:18 +01:00
Mark Haines	1f590f3e9a	Merge pull request #765 from matrix-org/markjh/open_id ... Add an openidish mechanism for proving that you own a given user_id	2016-05-05 19:26:30 +01:00
Mark Haines	573ef3f1c9	Rename openid/token to openid/request_token	2016-05-05 15:15:00 +01:00
Mark Haines	9c272da05f	Add an openidish mechanism for proving to third parties that you own a given user_id	2016-05-05 13:42:44 +01:00
Erik Johnston	97b9141245	Merge pull request #762 from matrix-org/erikj/report_event ... Add /report endpoint	2016-05-04 19:05:49 +01:00
Erik Johnston	fcd1eb642d	Add primary key	2016-05-04 16:51:51 +01:00
Erik Johnston	8e6a163f27	Add timestamp and auto incrementing ID	2016-05-04 15:19:12 +01:00
Erik Johnston	5650e38e7d	Move event_id to path	2016-05-04 13:19:39 +01:00
Matthew Hodgson	8a04412fa1	starting point for doc on how log contexts are supposed to work	2016-05-04 12:19:04 +01:00
Erik Johnston	984d4a2c0f	Add /report endpoint	2016-05-04 11:28:10 +01:00
Erik Johnston	7ea3b4118d	Merge pull request #757 from matrix-org/erikj/event_auth_typo ... Fix typo in event_auth servlet path	2016-05-03 14:23:15 +01:00
David Baker	56aae0eaf5	Merge pull request #758 from matrix-org/dbkr/fix_password_reset ... Fix password reset	2016-04-29 12:45:39 +01:00
David Baker	dc2c527ce9	Fix password reset ... Default requester to None, otherwise it isn't defined when resetting using email auth	2016-04-29 12:07:54 +01:00
Erik Johnston	62b51b8452	Fix typo in event_auth servlet path	2016-04-29 12:00:51 +01:00
Mark Haines	351b50a887	Fix more typos in per-request metrics	2016-04-28 15:29:46 +01:00
Mark Haines	dcfc10b129	Fix typo in request metrics	2016-04-28 15:11:06 +01:00
Matthew Hodgson	aebd0c9717	fix typo	2016-04-28 15:09:25 +01:00
Mark Haines	1c188cf73c	Merge pull request #756 from matrix-org/markjh/more_metrics ... Report per request metrics for all of the things using request_handler	2016-04-28 14:59:45 +01:00
Mark Haines	1a12766e3b	Add a comment explaining why automatic metric reporting is disabled for JsonResource	2016-04-28 12:31:26 +01:00
Mark Haines	6037349512	Check if report_metrics is True	2016-04-28 12:26:07 +01:00
Mark Haines	8d7ad44331	Report per request metrics for all of the things using request_handler	2016-04-28 10:57:49 +01:00
Mark Haines	21d188bf95	Merge pull request #755 from matrix-org/markjh/right_direction ... Fix backfill replication to advance the stream correctly	2016-04-27 15:54:48 +01:00
Mark Haines	8a65666454	Fix backfill replication to advance the stream correctly	2016-04-27 15:38:43 +01:00
Mark Haines	c7c03bf303	Merge pull request #754 from matrix-org/markjh/check_for_nop ... Check that something has happend before running the selects	2016-04-27 13:36:47 +01:00
Mark Haines	871357d539	Check that somethign has happend before running the selects	2016-04-27 11:54:13 +01:00
Mark Haines	71df327190	Actually start the pusher daemon	2016-04-26 17:07:09 +01:00
Mark Haines	c9eab73f2a	Fix typo in default pusher config	2016-04-26 17:06:18 +01:00
Mark Haines	47571d11db	Merge pull request #753 from matrix-org/markjh/daemon_pusher ... Optionally daemonize the pusher	2016-04-26 16:11:44 +01:00
Mark Haines	b80b93ea0f	Add a log context to the daemonized pusher	2016-04-26 15:57:28 +01:00
Mark Haines	6df5a6a833	Optionally daemonize the pusher	2016-04-26 15:37:41 +01:00
Erik Johnston	3306cf45ca	Merge pull request #750 from matrix-org/erikj/jwt_optional ... Make pyjwt dependency optional	2016-04-26 11:07:22 +01:00
Mark Haines	c487c42492	Merge pull request #752 from matrix-org/markjh/more_updates ... Add a couple of update methods to the PusherSlaveStore	2016-04-26 11:00:40 +01:00
Mark Haines	9c417c54d4	Add a couple of update methods to the PusherSlaveStore	2016-04-26 10:45:02 +01:00
Mark Haines	9843f2a657	Merge pull request #751 from matrix-org/markjh/pusher_metrics_manhole ... Add a metrics listener and a ssh listener to the pusher	2016-04-26 10:35:51 +01:00
Mark Haines	f15e9e8de4	Remove the uncomments from the comments	2016-04-25 17:56:24 +01:00
Mark Haines	72e2fafa20	Add a metrics listener and a ssh listener to the pusher	2016-04-25 17:34:25 +01:00
Mark Haines	233bf78ab4	Merge pull request #749 from matrix-org/markjh/split_manhole ... Split out setting up the manhole to a separate file	2016-04-25 15:23:53 +01:00
Mark Haines	f22f46f4f9	Move the listenTCP call outside the manhole function	2016-04-25 14:59:21 +01:00
Erik Johnston	52ecbc2843	Make pyjwt dependency optional	2016-04-25 14:30:15 +01:00
Mark Haines	5905f36f05	Split out setting up the manhole to a separate file	2016-04-22 17:09:15 +01:00
Mark Haines	c3f8dbf6b5	Merge pull request #748 from matrix-org/markjh/split_out_site.py ... Move SynapseSite to its own file	2016-04-22 17:08:21 +01:00
Mark Haines	62607d5452	Merge branch 'develop' into markjh/split_out_site.py ... Conflicts: synapse/app/homeserver.py	2016-04-22 16:26:57 +01:00
Mark Haines	e57df8fa86	Merge pull request #747 from matrix-org/markjh/http_resource_tree ... Split out create_resource_tree to a separate file	2016-04-22 16:24:55 +01:00
Mark Haines	e856036f4c	Move SynapseSite to its own file	2016-04-22 16:09:55 +01:00
Mark Haines	9e7aa98c22	Split out create_resource_tree to a separate file	2016-04-22 15:40:51 +01:00
Mark Haines	2022ae0fb9	Merge pull request #746 from matrix-org/markjh/split_out_pusher ... Optionally split out the pushers into a separate process	2016-04-22 11:34:08 +01:00
Erik Johnston	64ec3493c1	Merge pull request #745 from matrix-org/erikj/search-index ... Optimise event_search in postgres	2016-04-22 11:23:49 +01:00