kallithea Changeset - 89b9037d68b7

Changeset - 89b9037d68b7

Parent rev.

Child rev.

[Not reviewed]

beta

0 8 0

Marcin Kuzminski - 15 years ago 2010-11-24 17:15:33
marcin@python-works.com

fixed Example celery config to ampq,
fixed session problems on models and celery,
implemented one base model as a parent for other

8 files changed with 35 insertions and 38 deletions:

celeryconfig.py

rhodecode/lib/celerylib/tasks.py

rhodecode/model/__init__.py

rhodecode/model/permission.py

rhodecode/model/repo.py

rhodecode/model/scm.py

rhodecode/model/settings.py

rhodecode/model/user.py

0 comments (0 inline, 0 general)

celeryconfig.py

➞

Show inline comments

@@ @@ -11,14 +11,16 @@ config = ConfigParser.ConfigParser({'her @@
 config.read('%s/%s' % (root, PYLONS_CONFIG_NAME))
 PYLONS_CONFIG = config
 CELERY_IMPORTS = ("rhodecode.lib.celerylib.tasks",)
 ## Result store settings.
 CELERY_RESULT_BACKEND = "database"
 CELERY_RESULT_DBURI = dict(config.items('app:main'))['sqlalchemy.db1.url']
 CELERY_RESULT_BACKEND = "amqp"
 CELERY_AMQP_TASK_RESULT_EXPIRES = 18000  # 5 hours.
 #CELERY_RESULT_DBURI = dict(config.items('app:main'))['sqlalchemy.db1.url']
 CELERY_RESULT_SERIALIZER = 'json'
 BROKER_CONNECTION_MAX_RETRIES = 30
 ## Broker settings.

rhodecode/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -277,13 +277,13 @@ def send_email(recipients, subject, body @@
 @task
 def create_repo_fork(form_data, cur_user):
     from rhodecode.model.repo import RepoModel
     from vcs import get_backend
     log = create_repo_fork.get_logger()
     repo_model = RepoModel()
+    repo_model = RepoModel(get_session())
     repo_model.create(form_data, cur_user, just_db=True, fork=True)
     repo_name = form_data['repo_name']
     repos_path = get_repos_path()
     repo_path = os.path.join(repos_path, repo_name)
     repo_fork_path = os.path.join(repos_path, form_data['fork_name'])
     alias = form_data['repo_type']

rhodecode/model/__init__.py

➞

Show inline comments

@@ @@ -18,6 +18,15 @@ def init_model(engine): @@
 #conf = appconfig('config:development.ini', relative_to = './../../')
 #load_environment(conf.global_conf, conf.local_conf)
+#
 #engine = engine_from_config(config, 'sqlalchemy.')
 #init_model(engine)
 # DO SOMETHING
 class BaseModel(object):
     def __init__(self, sa=None):
         if sa is not None:
             self.sa = sa
         else:
             self.sa = meta.Session()

rhodecode/model/permission.py

➞

Show inline comments

@@ @@ -17,27 +17,24 @@ @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on Aug 20, 2010
 Model for permissions
-@author: marcink
+:author: marcink
 """
 from rhodecode.model import BaseModel
 from rhodecode.model.db import User, Permission, UserToPerm, RepoToPerm
 from rhodecode.model.caching_query import FromCache
 from rhodecode.model.meta import Session
 import logging
 import traceback
 log = logging.getLogger(__name__)
 class PermissionModel(object):
     def __init__(self):
         self.sa = Session()
 class PermissionModel(BaseModel):
     def get_permission(self, permission_id, cache=False):
         perm = self.sa.query(Permission)
         if cache:
             perm = perm.options(FromCache("sql_cache_short",
                                           "get_permission_%s" % permission_id))

rhodecode/model/repo.py

➞

Show inline comments

@@ @@ -18,30 +18,27 @@ @@
 # MA  02110-1301, USA.
 """
 Created on Jun 5, 2010
 model for handling repositories actions
 :author: marcink
 """
-from vcs.backends import get_repo, get_backend
 from vcs.backends import get_backend
 from datetime import datetime
 from pylons import app_globals as g
 from rhodecode.model.db import Repository, RepoToPerm, User, Permission, \
     Statistics
-from rhodecode.model.meta import Session
+from rhodecode.model import BaseModel
 from rhodecode.model.user import UserModel
 from rhodecode.model.caching_query import FromCache
 import logging
 import os
 import shutil
 import traceback
 log = logging.getLogger(__name__)
 class RepoModel(object):
     def __init__(self):
         self.sa = Session()
 class RepoModel(BaseModel):
     def get(self, repo_id, cache=False):
         repo = self.sa.query(Repository)\
             .filter(Repository.repo_id == repo_id)
         if cache:
@@ @@ -54,13 +51,13 @@ class RepoModel(object): @@
         repo = self.sa.query(Repository)\
             .filter(Repository.repo_name == repo_name)
         if cache:
             repo = repo.options(FromCache("sql_cache_short",
                                           "get_repo_%s" % repo_name))
-        return repo.scalar()
         return repo.scalar()
     def get_users_js(self):
         users = self.sa.query(User).filter(User.active == True).all()
         u_tmpl = '''{id:%s, fname:"%s", lname:"%s", nname:"%s"},'''
         users_array = '[%s];' % '\n'.join([u_tmpl % (u.user_id, u.name,
@@ @@ -72,28 +69,28 @@ class RepoModel(object): @@
     def update(self, repo_name, form_data):
         try:
             #update permissions
             for username, perm in form_data['perms_updates']:
                 r2p = self.sa.query(RepoToPerm)\
                         .filter(RepoToPerm.user == UserModel()\
+                        .filter(RepoToPerm.user == UserModel(self.sa)\
                                 .get_by_username(username, cache=False))\
                         .filter(RepoToPerm.repository == \
                                 self.get_by_repo_name(repo_name))\
                         .one()
                 r2p.permission_id = self.sa.query(Permission).filter(
-                                                Permission.permission_name ==
                                                 Permission.permission_name ==
                                                 perm).one().permission_id
                 self.sa.add(r2p)
             #set new permissions
             for username, perm in form_data['perms_new']:
                 r2p = RepoToPerm()
                 r2p.repository = self.get_by_repo_name(repo_name)
                 r2p.user = UserModel().get_by_username(username, cache=False)
+                r2p.user = UserModel(self.sa).get_by_username(username, cache=False)
                 r2p.permission_id = self.sa.query(Permission).filter(
                                         Permission.permission_name == perm)\
                                         .one().permission_id
                 self.sa.add(r2p)
@@ @@ -141,25 +138,26 @@ class RepoModel(object): @@
             new_repo.user_id = cur_user.user_id
             self.sa.add(new_repo)
             #create default permission
             repo_to_perm = RepoToPerm()
             default = 'repository.read'
             for p in UserModel().get_by_username('default', cache=False).user_perms:
+            for p in UserModel(self.sa).get_by_username('default', cache=False).user_perms:
                 if p.permission.permission_name.startswith('repository.'):
                     default = p.permission.permission_name
                     break
             default_perm = 'repository.none' if form_data['private'] else default
             repo_to_perm.permission_id = self.sa.query(Permission)\
                     .filter(Permission.permission_name == default_perm)\
                     .one().permission_id
             repo_to_perm.repository_id = new_repo.repo_id
             repo_to_perm.user_id = UserModel().get_by_username('default', cache=False).user_id
             repo_to_perm.user_id = UserModel(self.sa)\
                 .get_by_username('default', cache=False).user_id
             self.sa.add(repo_to_perm)
             self.sa.commit()
             if not just_db:
                 self.__create_repo(repo_name, form_data['repo_type'])
         except:

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -25,13 +25,13 @@ Model for RhodeCode @@
 from beaker.cache import cache_region, region_invalidate
 from mercurial import ui
 from rhodecode import BACKENDS
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import HasRepoPermissionAny
 from rhodecode.lib.utils import get_repos, make_ui, action_logger
-from rhodecode.model import meta
+from rhodecode.model import BaseModel
 from rhodecode.model.db import Repository, User, RhodeCodeUi, CacheInvalidation, \
     UserFollowing
 from rhodecode.model.caching_query import FromCache
 from sqlalchemy.orm import joinedload
 from sqlalchemy.orm.session import make_transient
 from vcs import get_backend
@@ @@ -51,20 +51,17 @@ class UserTemp(object): @@
 class RepoTemp(object):
     def __init__(self, repo_id):
         self.repo_id = repo_id
-class ScmModel(object):
+class ScmModel(BaseModel):
     """
     Mercurial Model
     """
     def __init__(self):
         self.sa = meta.Session()
     @LazyProperty
     def repos_path(self):
         """
         Get's the repositories root path from database
         """
         q = self.sa.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == '/').one()

rhodecode/model/settings.py

➞

Show inline comments

@@ @@ -17,33 +17,30 @@ @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on Nov 17, 2010
 Model for RhodeCode
-@author: marcink
+:author: marcink
 """
 from rhodecode.lib import helpers as h
-from rhodecode.model import meta
+from rhodecode.model import BaseModel
 from rhodecode.model.caching_query import FromCache
 from rhodecode.model.db import  RhodeCodeSettings
 from sqlalchemy.orm import joinedload
 from sqlalchemy.orm.session import make_transient
 import logging
 log = logging.getLogger(__name__)
-class SettingsModel(object):
+class SettingsModel(BaseModel):
     """
     Settings model
     """
     def __init__(self):
         self.sa = meta.Session()
     def get(self, settings_key, cache=False):
         r = self.sa.query(RhodeCodeSettings)\
             .filter(RhodeCodeSettings.app_settings_name == settings_key).scalar()
         if cache:
             r = r.options(FromCache("sql_cache_short",
                                           "get_setting_%s" % settings_key))

rhodecode/model/user.py

➞

Show inline comments

@@ @@ -21,28 +21,25 @@ @@
 Created on April 9, 2010
 Model for users
 :author: marcink
 """
 from pylons.i18n.translation import _
 from rhodecode.model import BaseModel
 from rhodecode.model.caching_query import FromCache
 from rhodecode.model.db import User
 from rhodecode.model.meta import Session
 from rhodecode.lib.exceptions import *
 import logging
 import traceback
 log = logging.getLogger(__name__)
 class UserModel(object):
     def __init__(self):
         self.sa = Session()
 class UserModel(BaseModel):
     def get(self, user_id, cache=False):
         user = self.sa.query(User)
         if cache:
             user = user.options(FromCache("sql_cache_short",
                                           "get_user_%s" % user_id))

0 comments (0 inline, 0 general)