summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-05-31 17:10:40 +0100
committerMark Haines <mark.haines@matrix.org>2016-05-31 17:10:40 +0100
commitc8c5bf950a27e00e3e9ae57b98f38cab03cdc3c9 (patch)
tree12b7e18cc73c255c10391c464638f6db6d26dd98 /synapse/storage
parentMerge pull request #805 from matrix-org/erikj/push_rules_cache (diff)
downloadsynapse-c8c5bf950a27e00e3e9ae57b98f38cab03cdc3c9.tar.xz
Fix synapse/storage/schema/delta/30/as_users.py
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/schema/delta/30/as_users.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/schema/delta/30/as_users.py b/synapse/storage/schema/delta/30/as_users.py
index b417e3ac08..5b7d8d1ab5 100644
--- a/synapse/storage/schema/delta/30/as_users.py
+++ b/synapse/storage/schema/delta/30/as_users.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import logging
-from synapse.storage.appservice import ApplicationServiceStore
+from synapse.config.appservice import load_appservices
 
 
 logger = logging.getLogger(__name__)
@@ -38,7 +38,7 @@ def run_upgrade(cur, database_engine, config, *args, **kwargs):
         logger.warning("Could not get app_service_config_files from config")
         pass
 
-    appservices = ApplicationServiceStore.load_appservices(
+    appservices = load_appservices(
         config.server_name, config_files
     )