# HG changeset patch # User Marcin Kuzminski # Date 1359235166 -3600 # Node ID 99c093d1a14217395092ddc454f7d2cb335ddbad # Parent b5a5a60608a76b74789972a4d4cd27a97e6efdf4 run waitress check on startup diff -r b5a5a60608a7 -r 99c093d1a142 rhodecode/config/environment.py --- a/rhodecode/config/environment.py Sat Jan 26 22:15:40 2013 +0100 +++ b/rhodecode/config/environment.py Sat Jan 26 22:19:26 2013 +0100 @@ -20,6 +20,7 @@ from rhodecode.lib.utils import repo2db_mapper, make_ui, set_rhodecode_config,\ load_rcextensions, check_git_version from rhodecode.lib.utils2 import engine_from_config, str2bool +from rhodecode.lib.db_manage import DbManage from rhodecode.model import init_model from rhodecode.model.scm import ScmModel @@ -88,7 +89,7 @@ #check git version check_git_version() - + DbManage.check_waitress() # MULTIPLE DB configs # Setup the SQLAlchemy database engine sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.') diff -r b5a5a60608a7 -r 99c093d1a142 rhodecode/lib/db_manage.py --- a/rhodecode/lib/db_manage.py Sat Jan 26 22:15:40 2013 +0100 +++ b/rhodecode/lib/db_manage.py Sat Jan 26 22:19:26 2013 +0100 @@ -704,7 +704,8 @@ reg_perm.permission = perm self.sa.add(reg_perm) - def finish(self): + @staticmethod + def check_waitress(): """ Function executed at the end of setup """ diff -r b5a5a60608a7 -r 99c093d1a142 rhodecode/websetup.py --- a/rhodecode/websetup.py Sat Jan 26 22:15:40 2013 +0100 +++ b/rhodecode/websetup.py Sat Jan 26 22:19:26 2013 +0100 @@ -48,4 +48,4 @@ dbmanage.populate_default_permissions() Session().commit() load_environment(conf.global_conf, conf.local_conf, initial=True) - dbmanage.finish() + DbManage.check_waitress()