summary refs log tree commit diff
path: root/synapse/config/database.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-11 17:01:38 +0000
committerErik Johnston <erik@matrix.org>2015-02-11 17:01:38 +0000
commit42bc56dad3b9ba9920d6cec364ddda8f1bc93f7e (patch)
treeb041e953b846e742438ae99de330462612273c6a /synapse/config/database.py
parentpyflakes (diff)
parentAllow newer versions of syutil (diff)
downloadsynapse-42bc56dad3b9ba9920d6cec364ddda8f1bc93f7e.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into use-simplejson
Diffstat (limited to 'synapse/config/database.py')
-rw-r--r--synapse/config/database.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/config/database.py b/synapse/config/database.py
index daa161c952..87efe54645 100644
--- a/synapse/config/database.py
+++ b/synapse/config/database.py
@@ -24,6 +24,7 @@ class DatabaseConfig(Config):
             self.database_path = ":memory:"
         else:
             self.database_path = self.abspath(args.database_path)
+        self.event_cache_size = self.parse_size(args.event_cache_size)
 
     @classmethod
     def add_arguments(cls, parser):
@@ -33,6 +34,10 @@ class DatabaseConfig(Config):
             "-d", "--database-path", default="homeserver.db",
             help="The database name."
         )
+        db_group.add_argument(
+            "--event-cache-size", default="100K",
+            help="Number of events to cache in memory."
+        )
 
     @classmethod
     def generate_config(cls, args, config_dir_path):