aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/app.py
diff options
context:
space:
mode:
authorjpope <jpope@jpope.org>2014-01-05 16:55:58 -0600
committerjpope <jpope@jpope.org>2014-01-05 16:55:58 -0600
commit0172ad000148f1cfe6f5110982c364f46b3d0ecb (patch)
treea32f97b2cc6fa6fb41de8263f8c6136922e87799 /mediagoblin/app.py
parent1e298b10c7cba2d27cb19f1aee03134f66ef6e20 (diff)
parent64eab630bf99e4d92e567628dbfc7cecf4cc27c4 (diff)
downloadmediagoblin-0172ad000148f1cfe6f5110982c364f46b3d0ecb.tar.lz
mediagoblin-0172ad000148f1cfe6f5110982c364f46b3d0ecb.tar.xz
mediagoblin-0172ad000148f1cfe6f5110982c364f46b3d0ecb.zip
Merge remote-tracking branch 'upstream/master' into skeletongobblin
Diffstat (limited to 'mediagoblin/app.py')
-rw-r--r--mediagoblin/app.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index e9177eff..e65e6d10 100644
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -25,6 +25,7 @@ from werkzeug.exceptions import HTTPException
from werkzeug.routing import RequestRedirect
from mediagoblin import meddleware, __version__
+from mediagoblin.db.util import check_db_up_to_date
from mediagoblin.tools import common, session, translate, template
from mediagoblin.tools.response import render_http_exception
from mediagoblin.tools.theme import register_themes
@@ -91,6 +92,9 @@ class MediaGoblinApp(object):
# Set up the database
self.db = setup_database(app_config['run_migrations'])
+ # Quit app if need to run dbupdate
+ check_db_up_to_date()
+
# Register themes
self.theme_registry, self.current_theme = register_themes(app_config)