From a9ad647fb27aaa5085a828157f30627edfbe76aa Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 2 Sep 2015 11:11:11 +0100 Subject: [PATCH 1/7] Make port script handle empty sent_transactions table --- scripts/synapse_port_db | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/synapse_port_db b/scripts/synapse_port_db index e7ed4c309..c02dff5ba 100755 --- a/scripts/synapse_port_db +++ b/scripts/synapse_port_db @@ -412,14 +412,17 @@ class Porter(object): self._convert_rows("sent_transactions", headers, rows) inserted_rows = len(rows) - max_inserted_rowid = max(r[0] for r in rows) + if inserted_rows: + max_inserted_rowid = max(r[0] for r in rows) - def insert(txn): - self.postgres_store.insert_many_txn( - txn, "sent_transactions", headers[1:], rows - ) + def insert(txn): + self.postgres_store.insert_many_txn( + txn, "sent_transactions", headers[1:], rows + ) - yield self.postgres_store.execute(insert) + yield self.postgres_store.execute(insert) + else: + max_inserted_rowid = 0 def get_start_id(txn): txn.execute( From aaf319820a8b59936a210c8998ed8feef58257cd Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 2 Sep 2015 15:29:03 +0100 Subject: [PATCH 2/7] Update README to include RAM requirements --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index d8d179135..5b30ee356 100644 --- a/README.rst +++ b/README.rst @@ -94,6 +94,7 @@ Synapse is the reference python/twisted Matrix homeserver implementation. System requirements: - POSIX-compliant system (tested on Linux & OS X) - Python 2.7 +- At least 512 MB RAM. Synapse is written in python but some of the libraries is uses are written in C. So before we can install synapse itself we need a working C compiler and the From e90f32646f2f4a51079a1e64405cadce616e54c3 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 2 Sep 2015 17:16:14 +0100 Subject: [PATCH 3/7] Bump version and changelog --- CHANGES.rst | 6 ++++++ synapse/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 8b9916c96..a964ffca9 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,9 @@ +Changes in synapse v0.10.0-rc6 (2015-09-02) +=========================================== + +* Remove some of the old database upgrade scripts. +* Fix database port script to work with newly created sqlite databases. + Changes in synapse v0.10.0-rc5 (2015-08-27) =========================================== diff --git a/synapse/__init__.py b/synapse/__init__.py index 57b8304d3..f8cb48ff1 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.10.0-rc5" +__version__ = "0.10.0-rc6" From fd0a919af3fa9cd200b6af8c9f185545ffe331ef Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 2 Sep 2015 17:27:59 +0100 Subject: [PATCH 4/7] Lists use 'append' --- synapse/config/_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1a6784a71..8a75c4873 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -182,7 +182,7 @@ class Config(object): ) % (entry_path, ) continue - files.add(config_path) + files.append(entry_path) config_files.extend(sorted(files)) else: From 9ad38c9807a215925d002869844b479ffc47fa0e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 3 Sep 2015 09:49:54 +0100 Subject: [PATCH 5/7] Bump version and changelog --- CHANGES.rst | 5 +++++ synapse/__init__.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index a964ffca9..2ec10516f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,8 @@ +Changes in synapse v0.10.0 (2015-09-03) +======================================= + +No change from release candidate. + Changes in synapse v0.10.0-rc6 (2015-09-02) =========================================== diff --git a/synapse/__init__.py b/synapse/__init__.py index f8cb48ff1..d85bb3dce 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.10.0-rc6" +__version__ = "0.10.0" From 1002bbd7322e48c9ecbb1ea21b3fb8a44e4a4360 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 3 Sep 2015 09:51:01 +0100 Subject: [PATCH 6/7] Change log level to info --- synapse/app/homeserver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index ff7807c2e..fefefffb8 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -341,7 +341,7 @@ def get_version_string(): ) ).encode("ascii") except Exception as e: - logger.warn("Failed to check for git repository: %s", e) + logger.info("Failed to check for git repository: %s", e) return ("Synapse/%s" % (synapse.__version__,)).encode("ascii") From 227b77409ffc1286ac3c8e44a55d54b72654f5c5 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 4 Sep 2015 08:56:23 +0100 Subject: [PATCH 7/7] DEPENDENCY_LINKS was turned to a list --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 16ccc0f1b..60ab8c789 100755 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ setup( "setuptools_trial", "mock" ], - dependency_links=dependencies["DEPENDENCY_LINKS"], + dependency_links=dependencies["DEPENDENCY_LINKS"].values(), include_package_data=True, zip_safe=False, long_description=long_description,