# HG changeset patch # User Mads Kiilerich # Date 1609255919 -3600 # Node ID a5c17c93d246ff35758779e02abd4eda7298709a # Parent 0270c714fa17ecfaf331731491571504c0711f3a celery: don't return values from task functions - we use ignore_result=True and will never get anything back when running async diff -r 0270c714fa17 -r a5c17c93d246 kallithea/lib/celerylib/__init__.py --- a/kallithea/lib/celerylib/__init__.py Sat Dec 26 20:21:24 2020 +0100 +++ b/kallithea/lib/celerylib/__init__.py Tue Dec 29 16:31:59 2020 +0100 @@ -78,11 +78,11 @@ def f_wrapped(*args, **kwargs): log.info('executing task %s in sync', f_org.__name__) try: - result = f_org(*args, **kwargs) + f_org(*args, **kwargs) except Exception as e: log.error('exception executing sync task %s in sync: %r', f_org.__name__, e) raise # TODO: return this in FakeTask as with async tasks? - return FakeTask(result) + return FakeTask(None) return f_wrapped diff -r 0270c714fa17 -r a5c17c93d246 kallithea/model/async_tasks.py --- a/kallithea/model/async_tasks.py Sat Dec 26 20:21:24 2020 +0100 +++ b/kallithea/model/async_tasks.py Tue Dec 29 16:31:59 2020 +0100 @@ -87,14 +87,14 @@ commits_by_day_aggregate = {} db_repo = db.Repository.get_by_repo_name(repo_name) if db_repo is None: - return True + return scm_repo = db_repo.scm_instance repo_size = scm_repo.count() # return if repo have no revisions if repo_size < 1: lock.release() - return True + return skip_date_limit = True parse_limit = int(config.get('commit_parse_limit')) @@ -115,7 +115,7 @@ # current state of parsing revision(from db marker) is the # last revision lock.release() - return True + return if cur_stats: commits_by_day_aggregate = OrderedDict(ext_json.loads( @@ -213,7 +213,7 @@ log.error(traceback.format_exc()) meta.Session().rollback() lock.release() - return False + return # final release lock.release() @@ -227,7 +227,6 @@ log.debug('Not recursing') except celerylib.LockHeld: log.info('Task with key %s already running', lockkey) - return 'Task with key %s already running' % lockkey @celerylib.task @@ -267,7 +266,7 @@ # configured in email_to, so return. if not recipients: log.error("No recipients specified and no fallback available.") - return False + return log.warning("No recipients specified for '%s' - sending to admins %s", subject, ' '.join(recipients)) @@ -304,7 +303,7 @@ else: log.error("SMTP mail server not configured - cannot send e-mail.") log.warning(logmsg) - return False + return msg = email.message.EmailMessage() msg['Subject'] = subject @@ -342,8 +341,6 @@ except: log.error('Mail sending failed') log.error(traceback.format_exc()) - return False - return True @celerylib.task @@ -418,8 +415,6 @@ repo.RepoModel()._delete_filesystem_repo(db_repo) raise - return True - @celerylib.task def create_repo_fork(form_data, cur_user): @@ -491,8 +486,6 @@ repo.RepoModel()._delete_filesystem_repo(db_repo) raise - return True - def __get_codes_stats(repo_name): scm_repo = db.Repository.get_by_repo_name(repo_name).scm_instance