kallithea Changeset - 6ed37675e78b

Changeset - 6ed37675e78b

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 15 years ago 2010-11-07 15:04:15
marcin@python-works.com

fixed celery tasks for using only one method of fetching main repos path

1 file changed with 4 insertions and 44 deletions:

rhodecode/lib/celerylib/tasks.py

0 comments (0 inline, 0 general)

rhodecode/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -4,19 +4,16 @@ from operator import itemgetter @@
 from pylons.i18n.translation import _
 from rhodecode.lib.celerylib import run_task, locked_task
 from rhodecode.lib.helpers import person
 from rhodecode.lib.smtp_mailer import SmtpMailer
 from rhodecode.lib.utils import OrderedDict
 from time import mktime
 from vcs.backends.hg import MercurialRepository
 from vcs.backends.git import GitRepository
 import os
 import traceback
 from vcs.backends import get_repo
 from vcs.utils.helpers import get_scm
 from rhodecode.model.hg import HgModel
 try:
     import json
 except ImportError:
     #python 2.5 compatibility
     import simplejson as json
@@ @@ -43,49 +40,12 @@ def get_session(): @@
         #If we don't use celery reuse our current application Session
         from rhodecode.model.meta import Session
         sa = Session()
     return sa
 def get_hg_settings():
     from rhodecode.model.db import RhodeCodeSettings
     sa = get_session()
     ret = sa.query(RhodeCodeSettings).all()
     if not ret:
         raise Exception('Could not get application settings !')
     settings = {}
     for each in ret:
         settings['rhodecode_' + each.app_settings_name] = each.app_settings_value
     return settings
 def get_hg_ui_settings():
     from rhodecode.model.db import RhodeCodeUi
     sa = get_session()
     ret = sa.query(RhodeCodeUi).all()
     if not ret:
         raise Exception('Could not get application ui settings !')
     settings = {}
     for each in ret:
         k = each.ui_key
         v = each.ui_value
         if k == '/':
             k = 'root_path'
         if k.find('.') != -1:
             k = k.replace('.', '_')
         if each.ui_section == 'hooks':
             v = each.ui_active
         settings[each.ui_section + '_' + k] = v
     return settings
 @task
 @locked_task
 def whoosh_index(repo_location, full_index):
     log = whoosh_index.get_logger()
     from rhodecode.lib.indexers.daemon import WhooshIndexingDaemon
     index_location = ''
@@ @@ -98,13 +58,13 @@ def get_commits_stats(repo_name, ts_min_ @@
     from rhodecode.model.db import Statistics, Repository
     log = get_commits_stats.get_logger()
     author_key_cleaner = lambda k: person(k).replace('"', "") #for js data compatibilty
     commits_by_day_author_aggregate = {}
     commits_by_day_aggregate = {}
-    repos_path = get_hg_ui_settings()['paths_root_path']
+    repos_path = HgModel().repos_path
     p = os.path.join(repos_path, repo_name)
     repo = get_repo(p)
     skip_date_limit = True
     parse_limit = 250 #limit for single task changeset parsing optimal for
     last_rev = 0
@@ @@ -294,13 +254,13 @@ 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(get_session())
     repo_model.create(form_data, cur_user, just_db=True, fork=True)
     repo_name = form_data['repo_name']
-    repos_path = get_hg_ui_settings()['paths_root_path']
+    repos_path = HgModel().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']
     log.info('creating repo fork %s as %s', repo_name, repo_path)
     backend = get_backend(alias)
@@ @@ -311,13 +271,13 @@ def __get_codes_stats(repo_name): @@
     'aspx', 'asx', 'axd', 'c', 'cfg', 'cfm', 'cpp', 'cs', 'diff', 'do', 'el',
     'erl', 'h', 'java', 'js', 'jsp', 'jspx', 'lisp', 'lua', 'm', 'mako', 'ml',
     'pas', 'patch', 'php', 'php3', 'php4', 'phtml', 'pm', 'py', 'rb', 'rst',
     's', 'sh', 'tpl', 'txt', 'vim', 'wss', 'xhtml', 'xml', 'xsl', 'xslt', 'yaws']
-    repos_path = get_hg_ui_settings()['paths_root_path']
+    repos_path = HgModel().repos_path
     p = os.path.join(repos_path, repo_name)
     repo = get_repo(p)
     tip = repo.get_changeset()
     code_stats = {}
     def aggregate(cs):

0 comments (0 inline, 0 general)