Mercurial > kallithea
diff pylons_app/lib/indexers/daemon.py @ 483:a9e50dce3081 celery
Removed config names from whoosh and celery,
celery is now configured based on the config name it's using
on celeryconfig. And whoosh uses it's own logger configured just for whoosh
Test creates a fresh whoosh index now, for more accurate checks
fixed tests for searching
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Fri, 17 Sep 2010 22:54:30 +0200 |
| parents | e01a85f9fc90 |
| children | fefffd6fd5f4 |
line wrap: on
line diff
--- a/pylons_app/lib/indexers/daemon.py Fri Sep 17 21:35:46 2010 +0200 +++ b/pylons_app/lib/indexers/daemon.py Fri Sep 17 22:54:30 2010 +0200 @@ -33,19 +33,30 @@ sys.path.append(project_path) from pidlock import LockHeld, DaemonLock -import traceback -from pylons_app.config.environment import load_environment from pylons_app.model.hg_model import HgModel from pylons_app.lib.helpers import safe_unicode from whoosh.index import create_in, open_dir from shutil import rmtree -from pylons_app.lib.indexers import ANALYZER, INDEX_EXTENSIONS, IDX_LOCATION, \ -SCHEMA, IDX_NAME +from pylons_app.lib.indexers import INDEX_EXTENSIONS, IDX_LOCATION, SCHEMA, IDX_NAME import logging -import logging.config -logging.config.fileConfig(jn(project_path, 'development.ini')) + log = logging.getLogger('whooshIndexer') +# create logger +log.setLevel(logging.DEBUG) + +# create console handler and set level to debug +ch = logging.StreamHandler() +ch.setLevel(logging.DEBUG) + +# create formatter +formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s") + +# add formatter to ch +ch.setFormatter(formatter) + +# add ch to logger +log.addHandler(ch) def scan_paths(root_location): return HgModel.repo_scan('/', root_location, None, True) @@ -221,6 +232,7 @@ WhooshIndexingDaemon(repo_location=repo_location)\ .run(full_index=full_index) l.release() + reload(logging) except LockHeld: sys.exit(1)