diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-17 17:26:46 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-17 17:26:46 +0000 |
| commit | 58554fa658b3acb49ed21d8bdd854f985042ead1 (patch) | |
| tree | 12a47cbe34d49fc30c37ccd9cb59214218b7d7a5 /synapse/storage | |
| parent | Add per server retry limiting. (diff) | |
| parent | Use absolute path when loading delta sql files (diff) | |
| download | synapse-58554fa658b3acb49ed21d8bdd854f985042ead1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into keyclient_retry_scheme
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index ec701014a9..d16e7b8fac 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -76,6 +76,8 @@ SCHEMAS = [ # database schema files, so the users will be informed on server restarts. SCHEMA_VERSION = 13 +dir_path = os.path.abspath(os.path.dirname(__file__)) + class _RollbackButIsFineException(Exception): """ This exception is used to rollback a transaction without implying @@ -583,7 +585,6 @@ def schema_path(schema): A filesystem path pointing at a ".sql" file. """ - dir_path = os.path.dirname(__file__) schemaPath = os.path.join(dir_path, "schema", schema + ".sql") return schemaPath |