fabb7acd45
Fix bug where we reconnected to the database on every query.
2015-05-01 10:24:24 +01:00
23c639ff32
Split a storage function in two so that we don't have to do extra work.
2015-05-01 10:17:19 +01:00
8be5284e91
Remove pointless join
2015-04-30 18:49:26 +01:00
503e4d3d52
Fix broken SQL
2015-04-30 18:44:47 +01:00
00718ae7a9
Need more yield
2015-04-30 18:43:39 +01:00
0465560c1a
Add missing param
2015-04-30 18:42:44 +01:00
61d05daab1
More join conditions
2015-04-30 18:41:05 +01:00
6ead27ddda
Add more conditions on JOINs to make postgres go a little faster.
2015-04-30 18:32:03 +01:00
50c87b8eed
Allow "manhole" to be ommited from the config
2015-04-30 18:11:47 +01:00
345995fcde
Remove the ~, comment the lines instead
2015-04-30 18:10:19 +01:00
62cebee8ee
Update key.py
2015-04-30 17:54:01 +01:00
95cbfee8ae
Update metrics.py
2015-04-30 17:52:20 +01:00
6ea9cf58be
missing import
2015-04-30 17:21:21 +01:00
f383d5a801
Fix up get_current_state and get_room_name_and_aliases queries to parse events in transaction
2015-04-30 17:12:52 +01:00
c95480963e
read the pid_file from the config file in synctl
2015-04-30 17:12:15 +01:00
2d4d2bbae4
Merge branch 'develop' into markjh/config_cleanup
...
Conflicts:
synapse/config/captcha.py
2015-04-30 16:54:55 +01:00
2f1348f339
Write a default log_config when generating config
2015-04-30 16:52:57 +01:00
69d4063651
Add get_rooms_for_user cache
2015-04-30 16:47:51 +01:00
5b02f33451
Undo changes to logger config, ie. remove the access_log_file option: decision is to support this through log_config rather tan adding an option.
2015-04-30 16:21:39 +01:00
054aa0d58c
Do access log using python's logging stuff, just under a separate logger name
2015-04-30 16:21:38 +01:00
3c4c229788
Don't use sub queries, it makes postgres sad
2015-04-30 16:16:53 +01:00
74aaacf82a
Don't break when sizes or durations are given as integers
2015-04-30 16:04:02 +01:00
29400b45b9
SYN-367: Use upsert rather than insert_or_replace
2015-04-30 15:21:31 +01:00
c28f1d16f0
Add a random string to the auto generated key id
2015-04-30 15:13:14 +01:00
265f30bd3f
Allow --enable-registration to be passed on the commandline
2015-04-30 15:04:06 +01:00
c9e62927f2
Use disable_registration keys if they are present
2015-04-30 14:34:09 +01:00
2366d28780
Don't needlessly join on state_events
2015-04-30 14:02:06 +01:00
d89a9f7283
Add an access_log
...
SYN-161 #resolve
2015-04-30 13:58:13 +01:00
1aa11cf7ce
Allow multiple config files, set up a default config before applying the config files
2015-04-30 13:48:15 +01:00
0c1b7f843b
Unused import
2015-04-30 13:33:30 +01:00
4b46fbec5b
Doesn't look like this is used anymore
2015-04-30 12:04:08 +01:00
1d7702833d
Make simple query rather than long one and then throw away half the results
2015-04-30 10:16:12 +01:00
6b69ddd17a
remove duplicate parse_size method
2015-04-30 04:26:29 +01:00
d624e2a638
Manually generate the default config yaml, remove most of the commandline 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
2015-04-30 04:24:44 +01:00
b1ca784aca
Correctly decode, for sqlite and postgres, rows from pushers table
2015-04-29 19:41:14 +01:00
4a9dc5b2f5
pushkey' are also bytes.
2015-04-29 19:27:02 +01:00
0ade2712d1
Typo
2015-04-29 19:17:25 +01:00
50f96f256f
Also remove yield from within lock in the other generator
2015-04-29 19:17:00 +01:00
d2d61a8288
Fix deadlock in id_generators. No idea why this was an actual deadlock.
2015-04-29 19:15:23 +01:00
3e71d13acf
Also log when we've started pushers
2015-04-29 18:37:42 +01:00
e7a6edb0ee
Revert previous
2015-04-29 18:37:30 +01:00
c27d6ad6b5
Only start pushers when synapse has fully started
2015-04-29 18:25:24 +01:00
46daf2d200
Start pushers on reactor thread
2015-04-29 18:22:20 +01:00
3864b3a8e6
Actually return rows
2015-04-29 18:07:36 +01:00
0618978238
Typo, args wrong way round
2015-04-29 18:04:35 +01:00
09177f4f2e
Decode buffers in same thread
2015-04-29 18:03:42 +01:00
472be88674
We store pusher data as bytes
2015-04-29 17:43:46 +01:00
a6e62cf6d0
Fix off by one in presence token handling
2015-04-29 17:37:11 +01:00
12d381bd5d
Decode the data json in the storage layer (was moved but this part was missed)
2015-04-29 17:13:51 +01:00
f8c30faf25
Oops, update the contraint too
2015-04-29 16:58:42 +01:00
61cd5d9045
Be more postgressive
2015-04-29 16:57:14 +01:00
fb95035a65
Be postgressive
2015-04-29 16:53:41 +01:00
4669def000
Oops, forgot the schema delta file
2015-04-29 16:50:16 +01:00
0337eaf321
txn.execute doesn't return cursors
2015-04-29 16:43:39 +01:00
884fb88e28
txn.execute doesn't return cursors
2015-04-29 16:35:20 +01:00
d76c058eea
Fix invalid SQL to work in postgres land
2015-04-29 16:30:25 +01:00
9927170787
Accept camelcase + underscores in binding too
2015-04-29 15:57:09 +01:00
109c8aafd2
Fix includes
2015-04-29 15:45:44 +01:00
b7788f80a3
Accept both camelcase and underscore threepid creds for transition
2015-04-29 15:41:29 +01:00
c8ed9bd278
pushers table requires an access_token
2015-04-29 15:33:27 +01:00
f2d90d5c02
Fix whitespace
2015-04-29 14:53:23 +01:00
845b0b2c97
Check requirements before doing anything else when running the homeserver
2015-04-29 14:52:42 +01:00
c0036ced54
bump syutil to 0.0.6
2015-04-29 14:16:41 +01:00
970a9b9d2b
We can't use REPLACE when upgrading databases now we have postgres
2015-04-29 13:55:44 +01:00
64991b0c8b
Merge pull request #129 from matrix-org/key_distribution
...
Key distribution v2
2015-04-29 13:34:38 +01:00
e26a3d8d9e
bump database schema version
2015-04-29 13:32:32 +01:00
1319905d7a
Use a defer.gatherResults to collect results from the perspective servers
2015-04-29 13:31:14 +01:00
a9549fdce3
Use bytea rather than BLOB
2015-04-29 13:16:09 +01:00
4ad8b45155
Merge branch 'develop' into key_distribution
...
Conflicts:
synapse/config/homeserver.py
2015-04-29 13:15:14 +01:00
74874ffda7
Update the query format used by keyring to match current key v2 spec
2015-04-29 12:14:08 +01:00
cd0864121b
Make postgres database error slightly more helpful
2015-04-29 12:12:25 +01:00
4932a7e2d9
Use __all__ instead of assert to stop pyflakes from warning about unused import in __init__
2015-04-29 12:12:25 +01:00
9894da6a29
Merge branch 'develop' into erikj/postgres_charset_check
2015-04-29 11:58:06 +01:00
46d200a3a1
Implement minimum_valid_until_ts in the remote key resource
2015-04-29 11:57:26 +01:00
a08bf11138
Appease PEP8
2015-04-29 11:44:48 +01:00
204132a998
Check that postgres database has correct charset set
2015-04-29 11:42:28 +01:00
f4c9ebbc34
Delete ugly commented out log line.
2015-04-29 11:07:13 +01:00
68c0603946
comment out ugly test logline
2015-04-29 00:14:44 +01:00
1783c7ca92
Ensure we never miss any presence updates
2015-04-28 17:24:24 +01:00
0126ef7f3c
Fix typo
2015-04-28 17:23:53 +01:00
d98edb548a
Ensure the serial returned by presence is always an integer
2015-04-28 17:20:32 +01:00
073b891ec1
Remove unused imports
2015-04-28 13:44:23 +01:00
327ca883ec
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
2015-04-28 13:39:42 +01:00
18f8247701
Use TEXT instead of VARCHAR(n), since PostgreSQL treats them the same except for a limit
2015-04-28 12:41:33 +01:00
9182f87664
Merge pull request #126 from matrix-org/csauth
...
Client / Server Auth Refactor
2015-04-28 11:00:27 +01:00
55e1bc8920
And don't bump the schema version unnecessarily
2015-04-28 10:54:15 +01:00
55fcf62e9c
Merge pull request #133 from matrix-org/invite_power_level
...
Invite power level
2015-04-28 10:50:34 +01:00
b96c133034
Add server_keys.sql to the current delta rather than creating a new delta
2015-04-28 10:50:00 +01:00
252e6f6869
Merge pull request #130 from matrix-org/server_rename_check
...
Fix for SYN-266
2015-04-28 10:39:31 +01:00
0bc71103e1
Output vim style mode markers into the yaml config file
2015-04-28 10:17:10 +01:00
f8b865264a
Merge branch 'develop' into key_distribution
...
Conflicts:
synapse/crypto/keyring.py
2015-04-27 18:29:32 +01:00
38432d8c25
Merge branch 'develop' into invite_power_level
2015-04-27 17:09:25 +01:00
42b7139dec
Remove unused import
2015-04-27 15:59:56 +01:00
1ef66cc3bd
Move database configuration into config module
2015-04-27 15:57:43 +01:00
416a3e6c4f
Ensure check_same_thread is enabled for sqlite3
2015-04-27 15:44:30 +01:00
8558e1ec73
Make get_max_token into inlineCallbacks so that the lock works.
2015-04-27 15:19:44 +01:00
6f8e2d517e
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
2015-04-27 14:41:40 +01:00
2c70849dc3
Fix newlines
2015-04-27 14:38:29 +01:00
0a016b0525
Pull inner function out.
2015-04-27 14:37:24 +01:00
e701aec2d1
Implement locks using create_observer for fetching media and server keys
2015-04-27 14:20:26 +01:00
412ece18e7
Add commentage.
2015-04-27 14:08:45 +01:00
1c82fbd2eb
Implement create_observer.
...
`create_observer` takes a deferred and create a new deferred that
*observers* the original deferred. Any callbacks added to the observing
deferred will *not* affect the origin deferred.
2015-04-27 13:59:37 +01:00
2732be83d9
Shuffle operations so that locking upsert happens last in the txn. This ensures the lock is held for the least amount of time possible.
2015-04-27 13:22:30 +01:00
e4c4664d73
Handle the fact that postgres databases can be restarted from under us
2015-04-27 12:40:49 +01:00
03c4f0ed67
pep8
2015-04-27 12:36:59 +01:00
f1acb9fd40
logging args
2015-04-27 11:56:34 +01:00
8a5be236e0
pep8
2015-04-27 11:49:18 +01:00
df75914791
pep8
2015-04-27 11:48:33 +01:00
b02e1006b9
Run database check before daemonizing, at the cost of database hygiene.
2015-04-27 11:46:00 +01:00
f8152f2708
rename db method to be more informative
2015-04-27 10:16:26 +01:00
2f475bd5d5
pep8
2015-04-24 18:15:07 +01:00
a7b51f4539
Check users in our table aren't on a different domain to the one we're configured with to try & fix SYN-266
2015-04-24 18:11:21 +01:00
288702170d
Add config for setting the perspective servers
2015-04-24 17:01:34 +01:00
1bac74b9ae
Change to https for ID server communication
2015-04-24 14:48:49 +01:00
ed83638668
Make one-to-one rule an underride otherwise bings don't work in one-to-one wrooms. Likewise a couple of other rules.
2015-04-24 14:27:17 +01:00
7ac8a60c6f
More underscores
2015-04-24 11:44:27 +01:00
c253b14f6e
Merge branch 'develop' into key_distribution
2015-04-24 11:29:46 +01:00
bdcb23ca25
Fix spelling
2015-04-24 11:29:19 +01:00
b2c2dc8940
Merge branch 'develop' into key_distribution
2015-04-24 11:28:10 +01:00
869dc94cbb
Call the super classes when generating config
2015-04-24 11:27:56 +01:00
a218619626
Use underscores instead of camelcase for id server stuff
2015-04-24 11:27:38 +01:00
b1e68add19
Add a config file for perspective servers
2015-04-24 11:26:19 +01:00
31e262e6b4
Copyright notice
2015-04-24 10:36:51 +01:00
eede182df7
Merge branch 'develop' into key_distribution
2015-04-24 10:35:49 +01:00
4e2f8b8722
Copyright notices
2015-04-24 10:35:29 +01:00
c8c710eca7
Move the key related config parser into a separate file
2015-04-24 10:22:22 +01:00
149ed9f151
Better help for the old-signing-key option
2015-04-24 10:07:55 +01:00
f7a79a37be
pep8
2015-04-24 09:42:37 +01:00
6532b6e607
Merge branch 'develop' into csauth
...
Conflicts:
synapse/http/server.py
2015-04-24 09:37:54 +01:00
74270defda
No commas here, otherwise our error string constants become tuples.
2015-04-24 09:28:57 +01:00
e1e5e53127
Remove users from the remote_offline_serials list (and clean up empty elements) when they go online again
2015-04-23 19:01:37 +01:00
b3bda8a75f
Don't let the remote offline serial list grow arbitrarily large
2015-04-23 18:40:47 +01:00
8a785c3006
Store a list of the presence serial number at which remote users went offline, so that when we delete them from the cachemap, we can still synthesize OFFLINE events for them (SYN-261)
2015-04-23 18:40:19 +01:00
191f7f09ce
Generate presence event-stream JSON structures directly
2015-04-23 18:27:25 +01:00
03eb4adc6e
Dedicated error code for failed 3pid auth verification
2015-04-23 18:20:17 +01:00
4bbf7156ef
Update to match the specification for key/v2
2015-04-23 16:39:13 +01:00
0eb61a3d16
Remove ultimately unused feature of saving params from the first call in the session: it's probably too open to abuse.
2015-04-23 14:44:12 +01:00
a2c10d37d7
Add an error code to 'missing token' response.
2015-04-23 13:23:44 +01:00
2e0d9219b9
Remove now-redundant email config
2015-04-23 11:45:29 +01:00
f30d47c876
Implement remote key lookup api
2015-04-22 14:21:08 +01:00
a16eaa0c33
Neater fetching of user's auth level in a room - squash to int() at access time (SYN-353)
2015-04-22 14:20:04 +01:00
f43063158a
Appease pep8
2015-04-22 13:12:11 +01:00
2808c040ef
Also remember to check 'invite' level for changes
2015-04-21 21:13:14 +01:00
48b6ee2b67
Create an 'invite' powerlevel when making new rooms
2015-04-21 21:07:35 +01:00
bc41f0398f
Initial implementation of an 'invite' power_level
2015-04-21 20:56:08 +01:00
d3309933f5
Much neater fetching of defined powerlevels from m.room.power_levels state event
2015-04-21 20:53:23 +01:00
b568c0231c
Remove debugging print statement accidentally committed
2015-04-21 20:21:14 +01:00
3a7d7a3f22
Sanitise a user's powerlevel to an int() before numerical comparison, because otherwise Python is "helpful" with it (SYN-351)
2015-04-21 20:18:29 +01:00
3ba522bb23
Merge branch 'develop' into key_distribution
2015-04-21 17:10:25 +01:00
6080830bef
Bump syutil version to 0.0.5
2015-04-21 17:04:06 +01:00
Erik Johnston