diff options
Diffstat (limited to 'rhodecode/lib/indexers/daemon.py')
| -rw-r--r-- | rhodecode/lib/indexers/daemon.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/rhodecode/lib/indexers/daemon.py b/rhodecode/lib/indexers/daemon.py index 51122e9c..ab239982 100644 --- a/rhodecode/lib/indexers/daemon.py +++ b/rhodecode/lib/indexers/daemon.py @@ -77,6 +77,8 @@ class WhooshIndexingDaemon(object): #filter repo list if repo_list: + #Fix non-ascii repo names to unicode + repo_list = map(safe_unicode, repo_list) self.filtered_repo_paths = {} for repo_name, repo in self.repo_paths.items(): if repo_name in repo_list: @@ -238,6 +240,7 @@ class WhooshIndexingDaemon(object): writer_is_dirty = False try: indexed_total = 0 + repo_name = None for repo_name, repo in self.repo_paths.items(): # skip indexing if there aren't any revs in the repo num_of_revs = len(repo) @@ -279,10 +282,10 @@ class WhooshIndexingDaemon(object): if writer_is_dirty: log.debug('>> COMMITING CHANGES TO CHANGESET INDEX<<') writer.commit(merge=True) - log.debug('>> COMMITTED CHANGES TO CHANGESET INDEX<<') + log.debug('>>> FINISHED REBUILDING CHANGESET INDEX <<<') else: writer.cancel - log.debug('>> NOTHING TO COMMIT<<') + log.debug('>> NOTHING TO COMMIT TO CHANGESET INDEX<<') def update_file_index(self): log.debug((u'STARTING INCREMENTAL INDEXING UPDATE FOR EXTENSIONS %s ' @@ -364,11 +367,11 @@ class WhooshIndexingDaemon(object): ) finally: if writer_is_dirty: - log.debug('>> COMMITING CHANGES <<') + log.debug('>> COMMITING CHANGES TO FILE INDEX <<') writer.commit(merge=True) - log.debug('>>> FINISHED REBUILDING INDEX <<<') + log.debug('>>> FINISHED REBUILDING FILE INDEX <<<') else: - log.debug('>> NOTHING TO COMMIT<<') + log.debug('>> NOTHING TO COMMIT TO FILE INDEX <<') writer.cancel() def build_indexes(self): |