mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-29 07:28:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:matrix-org/synapse into develop

Browse source
This commit is contained in:
Erik Johnston 2015-05-08 16:11:19 +01:00
commit 724bb1e7d9
6 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
AUTHORS.rst
View file

@ -35,3 +35,6 @@ Turned to Dust <dwinslow86 at gmail.com>
Brabo <brabo at riseup.net> Brabo <brabo at riseup.net>
* Installation instruction fixes * Installation instruction fixes
Ivan Shapovalov <intelfx100 at gmail.com>
* contrib/systemd: a sample systemd unit file and a logger configuration

2
CHANGES.rst
View file

@ -10,6 +10,8 @@ General:
* Fix race in caches that occasionally caused some presence updates to be * Fix race in caches that occasionally caused some presence updates to be
dropped - SYN-369. dropped - SYN-369.
* Check server name has not changed on restart. * Check server name has not changed on restart.
* Add a sample systemd unit file and a logger configuration in
contrib/systemd. Contributed Ivan Shapovalov.
Federation: Federation:

2
UPGRADE.rst
View file

@ -1,4 +1,4 @@
Upgrading to v0.x.x Upgrading to v0.9.0
=================== ===================
Application services have had a breaking API change in this version. Application services have had a breaking API change in this version.

6
docs/postgres.rst
View file

@ -82,13 +82,13 @@ complete, restart synapse. For instance::
cp homeserver.db homeserver.db.snapshot cp homeserver.db homeserver.db.snapshot
./synctl start ./synctl start
Assuming your database config file (as described in the section *Synapse Assuming your new config file (as described in the section *Synapse config*)
config*) is named ``database_config.yaml`` and the SQLite snapshot is at is named ``homeserver-postgres.yaml`` and the SQLite snapshot is at
``homeserver.db.snapshot`` then simply run:: ``homeserver.db.snapshot`` then simply run::
python scripts/port_from_sqlite_to_postgres.py \ python scripts/port_from_sqlite_to_postgres.py \
--sqlite-database homeserver.db.snapshot \ --sqlite-database homeserver.db.snapshot \
--postgres-config database_config.yaml --postgres-config homeserver-postgres.yaml
The flag ``--curses`` displays a coloured curses progress UI. The flag ``--curses`` displays a coloured curses progress UI.

9
scripts/port_from_sqlite_to_postgres.py
View file

@ -106,7 +106,7 @@ class Store(object):
try: try:
txn = conn.cursor() txn = conn.cursor()
return func( return func(
LoggingTransaction(txn, desc, self.database_engine), LoggingTransaction(txn, desc, self.database_engine, []),
*args, **kwargs *args, **kwargs
) )
except self.database_engine.module.DatabaseError as e: except self.database_engine.module.DatabaseError as e:
@ -378,9 +378,7 @@ class Porter(object):
for i, row in enumerate(rows): for i, row in enumerate(rows):
rows[i] = tuple( rows[i] = tuple(
self.postgres_store.database_engine.encode_parameter( conv(j, col)
conv(j, col)
)
for j, col in enumerate(row) for j, col in enumerate(row)
if j > 0 if j > 0
) )
@ -725,6 +723,9 @@ if __name__ == "__main__":
postgres_config = yaml.safe_load(args.postgres_config) postgres_config = yaml.safe_load(args.postgres_config)
if "database" in postgres_config:
postgres_config = postgres_config["database"]
if "name" not in postgres_config: if "name" not in postgres_config:
sys.stderr.write("Malformed database config: no 'name'") sys.stderr.write("Malformed database config: no 'name'")
sys.exit(2) sys.exit(2)

2
synapse/__init__.py
View file

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server. """ This is a reference implementation of a Matrix home server.
""" """
__version__ = "0.9.0" __version__ = "0.9.0-r1"