summary refs log tree commit diff
path: root/synapse/appservice
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2015-03-06 17:27:55 +0000
committerKegan Dougal <kegan@matrix.org>2015-03-06 17:27:55 +0000
commit4a6afa6abf6c90c393bc3fa00e40d3927fc0c6c1 (patch)
treeb2d213eba05188c4bd7928c4383fd6fb0bf48f11 /synapse/appservice
parentAdd appservice txns sql schema (diff)
downloadsynapse-4a6afa6abf6c90c393bc3fa00e40d3927fc0c6c1.tar.xz
Assign the AS ID from the database; replace old placeholder txn id.
Diffstat (limited to 'synapse/appservice')
-rw-r--r--synapse/appservice/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/appservice/__init__.py b/synapse/appservice/__init__.py
index 743a8278ad..c60db16b74 100644
--- a/synapse/appservice/__init__.py
+++ b/synapse/appservice/__init__.py
@@ -79,13 +79,13 @@ class ApplicationService(object):
     NS_LIST = [NS_USERS, NS_ALIASES, NS_ROOMS]
 
     def __init__(self, token, url=None, namespaces=None, hs_token=None,
-                 sender=None, txn_id=None):
+                 sender=None, id=None):
         self.token = token
         self.url = url
         self.hs_token = hs_token
         self.sender = sender
         self.namespaces = self._check_namespaces(namespaces)
-        self.txn_id = txn_id
+        self.id = id
 
     def _check_namespaces(self, namespaces):
         # Sanity check that it is of the form: