Matthew Hodgson
|
792def4928
|
add a url_preview_ip_range_whitelist config param so we can whitelist the matrix.org IP space
|
2016-05-01 12:44:24 +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 |
|
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 |
|
Erik Johnston
|
4063fe0283
|
Update port script
|
2016-04-22 10:35:53 +01:00 |
|
Erik Johnston
|
183cacac90
|
Simplify query and handle finishing correctly
|
2016-04-22 10:01:57 +01:00 |
|
Erik Johnston
|
ae571810f2
|
Order NULLs first
|
2016-04-21 18:14:18 +01:00 |
|
Erik Johnston
|
3ddbb1687c
|
Fix query
|
2016-04-21 18:02:36 +01:00 |
|
Erik Johnston
|
8fae3d7b1e
|
Use special UPDATE syntax
|
2016-04-21 18:01:49 +01:00 |
|
Erik Johnston
|
b57dcb4b51
|
Typo
|
2016-04-21 17:49:00 +01:00 |
|
Erik Johnston
|
26db18bc90
|
Need to do _background_update_progress_txn in actual transaction
|
2016-04-21 17:45:56 +01:00 |
|
Erik Johnston
|
b9675ef6e6
|
Merge pull request #687 from nikriek/jwt-fix
Fix issues with JWT login
|
2016-04-21 17:42:25 +01:00 |
|
Erik Johnston
|
e395eb1108
|
Update progress when creating index
|
2016-04-21 17:39:24 +01:00 |
|
Erik Johnston
|
3b0fa77f50
|
Fix SQL statement
|
2016-04-21 17:37:42 +01:00 |
|
Erik Johnston
|
129e403487
|
Create index must be on a conn
|
2016-04-21 17:35:51 +01:00 |
|
Mark Haines
|
a3ac837599
|
Optionally split out the pushers into a separate process
|
2016-04-21 17:22:37 +01:00 |
|
Mark Haines
|
78741cf025
|
Merge pull request #743 from matrix-org/markjh/slave_pushers
Replicate the pushers
|
2016-04-21 17:21:29 +01:00 |
|
Erik Johnston
|
51bb339ab2
|
Create index concurrently
|
2016-04-21 17:16:11 +01:00 |
|