changeset 2102:04d26165c3d9 beta

Whoosh logging is now controlled by the .ini files logging setup
author Marcin Kuzminski <marcin@python-works.com>
date Mon, 05 Mar 2012 02:46:08 +0200
parents df96adcbb1f7
children e82c04f52b9f
files development.ini production.ini rhodecode/config/deployment.ini_tmpl rhodecode/lib/indexers/__init__.py rhodecode/lib/utils.py
diffstat 5 files changed, 26 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/development.ini	Sun Mar 04 19:57:42 2012 +0000
+++ b/development.ini	Mon Mar 05 02:46:08 2012 +0200
@@ -171,6 +171,7 @@
 
 beaker.session.type = file
 beaker.session.key = rhodecode
+# secure cookie requires AES python libraries
 #beaker.session.encrypt_key = g654dcno0-9873jhgfreyu
 #beaker.session.validate_key = 9712sds2212c--zxc123
 beaker.session.timeout = 36000
@@ -213,7 +214,7 @@
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, routes, rhodecode, sqlalchemy, beaker, templates
+keys = root, routes, rhodecode, sqlalchemy, beaker, templates, whoosh_indexer
 
 [handlers]
 keys = console, console_sql
@@ -259,6 +260,12 @@
 qualname = sqlalchemy.engine
 propagate = 0
 
+[logger_whoosh_indexer]
+level = DEBUG
+handlers = 
+qualname = whoosh_indexer
+propagate = 1
+
 ##############
 ## HANDLERS ##
 ##############
--- a/production.ini	Sun Mar 04 19:57:42 2012 +0000
+++ b/production.ini	Mon Mar 05 02:46:08 2012 +0200
@@ -214,7 +214,7 @@
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, routes, rhodecode, sqlalchemy, beaker, templates
+keys = root, routes, rhodecode, sqlalchemy, beaker, templates, whoosh_indexer
 
 [handlers]
 keys = console, console_sql
@@ -260,6 +260,12 @@
 qualname = sqlalchemy.engine
 propagate = 0
 
+[logger_whoosh_indexer]
+level = DEBUG
+handlers = 
+qualname = whoosh_indexer
+propagate = 1
+
 ##############
 ## HANDLERS ##
 ##############
--- a/rhodecode/config/deployment.ini_tmpl	Sun Mar 04 19:57:42 2012 +0000
+++ b/rhodecode/config/deployment.ini_tmpl	Mon Mar 05 02:46:08 2012 +0200
@@ -224,7 +224,7 @@
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, routes, rhodecode, sqlalchemy, beaker, templates
+keys = root, routes, rhodecode, sqlalchemy, beaker, templates, whoosh_indexer
 
 [handlers]
 keys = console, console_sql
@@ -270,6 +270,12 @@
 qualname = sqlalchemy.engine
 propagate = 0
 
+[logger_whoosh_indexer]
+level = DEBUG
+handlers = 
+qualname = whoosh_indexer
+propagate = 1
+
 ##############
 ## HANDLERS ##
 ##############
--- a/rhodecode/lib/indexers/__init__.py	Sun Mar 04 19:57:42 2012 +0000
+++ b/rhodecode/lib/indexers/__init__.py	Mon Mar 05 02:46:08 2012 +0200
@@ -25,6 +25,7 @@
 import os
 import sys
 import traceback
+import logging
 from os.path import dirname as dn, join as jn
 
 #to get the rhodecode import
@@ -84,7 +85,7 @@
     parser = Command.standard_parser(verbose=True)
 
     def command(self):
-
+        logging.config.fileConfig(self.path_to_ini_file)
         from pylons import config
         add_cache(config)
         engine = engine_from_config(config, 'sqlalchemy.db1.')
--- a/rhodecode/lib/utils.py	Sun Mar 04 19:57:42 2012 +0000
+++ b/rhodecode/lib/utils.py	Mon Mar 05 02:46:08 2012 +0200
@@ -629,6 +629,6 @@
         """
         from pylons import config as pylonsconfig
 
-        path_to_ini_file = os.path.realpath(conf)
-        conf = paste.deploy.appconfig('config:' + path_to_ini_file)
+        self.path_to_ini_file = os.path.realpath(conf)
+        conf = paste.deploy.appconfig('config:' + self.path_to_ini_file)
         pylonsconfig.init_app(conf.global_conf, conf.local_conf)