Erik Johnston
|
51fb590c0e
|
Use more efficient query form
|
2015-12-11 11:12:57 +00:00 |
|
David Baker
|
a24eedada7
|
pep8
|
2015-12-09 15:57:42 +00:00 |
|
David Baker
|
4a728beba1
|
Split out the push rule evaluator into a separate file so it can be more readily reused. Should be functionally identical.
|
2015-12-09 15:51:34 +00:00 |
|
Mark Haines
|
e4bfe50e8f
|
Allow filter JSON object in the filter query parameter in /sync
Documented by matrix-org/matrix-doc#224
|
2015-12-09 12:56:50 +00:00 |
|
Daniel Wagner-Hall
|
0f826b0b0d
|
Merge pull request #430 from matrix-org/daniel/unstable
Merge pull request #430 from matrix-org/daniel/unstable
|
2015-12-09 11:34:22 +00:00 |
|
Erik Johnston
|
7c2ff8c889
|
Merge pull request #405 from matrix-org/erikj/search-ts
Change the result dict to be a list in /search response
|
2015-12-08 16:15:27 +00:00 |
|
Daniel Wagner-Hall
|
7a8ba4c9a0
|
Actually host r0 and unstable prefixes
|
2015-12-08 15:26:52 +00:00 |
|
Mark Haines
|
6a5ff5f223
|
Track the time spent in the database per request.
and track the number of transactions that request started.
|
2015-12-07 17:56:11 +00:00 |
|
Mark Haines
|
f7a1cdbbc6
|
Merge pull request #423 from matrix-org/markjh/archived_flag
Only include the archived rooms if a include_leave flag in set in the…
|
2015-12-07 13:16:03 +00:00 |
|
Mark Haines
|
d547afeae0
|
Merge remote-tracking branch 'origin/master' into develop
|
2015-12-07 13:13:43 +00:00 |
|
David Baker
|
9c9b2829ae
|
also do more structured logging
|
2015-12-07 12:01:00 +00:00 |
|
David Baker
|
50e5886de1
|
pep8
|
2015-12-07 11:57:48 +00:00 |
|
David Baker
|
ba1d740239
|
Add logging to pushers API to log the body of the request
|
2015-12-07 11:52:20 +00:00 |
|
Mark Haines
|
a190b2e85e
|
Merge pull request #427 from matrix-org/markjh/log_context
Add a setter for the current log context.
|
2015-12-07 11:00:12 +00:00 |
|
Mark Haines
|
3dd1630848
|
Add a setter for the current log context.
Move the resource tracking inside that setter so that it is easier
to make sure that the resource tracking isn't double counting the
resource usage.
|
2015-12-07 10:51:18 +00:00 |
|
Daniel Wagner-Hall
|
41905784f7
|
Take object not bool
Allows bool as legacy fallback
See https://github.com/matrix-org/matrix-doc/pull/212
|
2015-12-07 10:44:33 +00:00 |
|
Mark Haines
|
660dee94af
|
Only include the archived rooms if a include_leave flag in set in the filter
|
2015-12-04 17:32:09 +00:00 |
|
Mark Haines
|
262a97f02b
|
Merge pull request #422 from matrix-org/markjh/schema
Bump schema version.
|
2015-12-04 15:45:44 +00:00 |
|
Mark Haines
|
d57c5cda71
|
Bump schema version.
As we released version 26 in v0.11.1
|
2015-12-04 15:28:39 +00:00 |
|
Mark Haines
|
99e1d6777f
|
Add metrics to track the cpu on the main thread consumed by each type of request
|
2015-12-04 14:42:24 +00:00 |
|
Mark Haines
|
3c85a317d6
|
Merge pull request #420 from matrix-org/markjh/resource_usage
Track the cpu used in the main thread by each logging context
|
2015-12-04 14:15:41 +00:00 |
|
Mark Haines
|
5231737369
|
Add comments to explain why we are hardcoding RUSAGE_THREAD
|
2015-12-04 11:53:38 +00:00 |
|
Mark Haines
|
d6059bdd2a
|
Fix warnings
|
2015-12-04 11:34:23 +00:00 |
|
Mark Haines
|
48a2526d62
|
Track the cpu used in the main thread by each logging context
|
2015-12-03 21:03:01 +00:00 |
|
Mark Haines
|
b29d2fd7f8
|
Merge pull request #419 from matrix-org/markjh/reuse_captcha_client
Reuse the captcha client rather than creating a new one for each request
|
2015-12-03 17:00:59 +00:00 |
|
Daniel Wagner-Hall
|
edfcb83473
|
Flatten devices into a dict, not a list
|
2015-12-03 16:19:21 +00:00 |
|
Mark Haines
|
478b4e3ed4
|
Reuse the captcha client rather than creating a new one for each request
|
2015-12-03 13:48:55 +00:00 |
|
Erik Johnston
|
b8680b82c3
|
Merge pull request #414 from matrix-org/erikj/if_not_exists
Older versions of SQLite don't like IF NOT EXISTS in virtual tables
|
2015-12-03 13:21:09 +00:00 |
|
Daniel Wagner-Hall
|
ac213c2e08
|
Merge pull request #415 from matrix-org/daniel/endpoints
Merge pull request #415 from matrix-org/daniel/endpoints
|
2015-12-03 12:19:12 +00:00 |
|
Daniel Wagner-Hall
|
e880164c59
|
Merge pull request #418 from matrix-org/daniel/whois
Merge pull request #418 from matrix-org/daniel/whois
|
2015-12-03 12:18:01 +00:00 |
|
Daniel Wagner-Hall
|
526bc33e02
|
Fix implementation of /admin/whois
|
2015-12-02 17:29:47 +00:00 |
|
David Baker
|
e515b48929
|
Just replace the table definition with the one from full_schema 16
|
2015-12-02 17:23:52 +00:00 |
|
David Baker
|
8810eb8c39
|
Fix schema delta 15 on postgres in the very unlikley event that anyone upgrades to 15...
|
2015-12-02 17:19:11 +00:00 |
|
Mark Haines
|
491f3d16dc
|
Make state updates in the C+S API idempotent
|
2015-12-02 15:50:50 +00:00 |
|
Daniel Wagner-Hall
|
872c134807
|
Update endpoints to reflect current spec
|
2015-12-02 15:45:04 +00:00 |
|
Erik Johnston
|
f721fdbf87
|
Merge pull request #412 from matrix-org/erikj/search
Search: Add prefix matching support
|
2015-12-02 13:56:41 +00:00 |
|
Erik Johnston
|
976cb5aaa8
|
Throw if unrecognized DB type
|
2015-12-02 13:50:43 +00:00 |
|
Erik Johnston
|
b2def42bfd
|
Older versions of SQLite don't like IF NOT EXISTS in virtual tables
|
2015-12-02 13:29:14 +00:00 |
|
Erik Johnston
|
b9acef5301
|
Fix so highlight matching works again
|
2015-12-02 13:28:13 +00:00 |
|
Mark Haines
|
58d0927767
|
Merge pull request #410 from matrix-org/markjh/edu_frequency
Only fire user_joined_room if the user has actually joined.
|
2015-12-02 13:17:15 +00:00 |
|
Erik Johnston
|
7dd6e5efca
|
Remove deuplication. Add comment about regex.
|
2015-12-02 13:09:37 +00:00 |
|
Mark Haines
|
5dc09e82c4
|
Merge pull request #413 from matrix-org/markjh/reuse_http_client
Reuse a single http client, rather than creating new ones
|
2015-12-02 12:56:23 +00:00 |
|
Mark Haines
|
c2c70f7daf
|
Use the context returned by _handle_new_event
|
2015-12-02 12:01:24 +00:00 |
|
Erik Johnston
|
477da77b46
|
Search: Add prefix matching support
|
2015-12-02 11:40:52 +00:00 |
|
Mark Haines
|
37b2d69bbc
|
Reuse a single http client, rather than creating new ones
|
2015-12-02 11:36:02 +00:00 |
|
David Baker
|
addb248e0b
|
Merge pull request #411 from matrix-org/default_dont_notify
Change the m.room.message rule to be disabled by default
|
2015-12-02 11:32:56 +00:00 |
|
David Baker
|
4b1281f9b7
|
Change the m.room.message rule to be disabled by default so we only notify for 1:1 rooms / highlights out-of-the-box
|
2015-12-02 11:26:49 +00:00 |
|
Mark Haines
|
dede14f689
|
Merge branch 'develop' into markjh/edu_frequency
|
2015-12-02 10:57:51 +00:00 |
|
Mark Haines
|
5eb4d13aaa
|
Fix typo in collect_presencelike_data
|
2015-12-02 10:50:58 +00:00 |
|
Mark Haines
|
c30cdb0d68
|
Add comments
|
2015-12-02 10:49:35 +00:00 |