update setup script and config tmpl

pylons_app/config/deployment.ini_tmpl

@@ -1,60 +1,156
-#
-# pylons_app - Pylons configuration
-#
-# The %(here)s variable will be replaced with the parent directory of this file
-#
+################################################################################
+################################################################################
+# hg-app - Pylons environment configuration                                    #
+#                                                                              # 
+# The %(here)s variable will be replaced with the parent directory of this file#
+################################################################################
+
 [DEFAULT]
 debug = true
-email_to = [e-mail]
-smtp_server = localhost
-error_email_from = paste@localhost
+############################################
+## Uncomment and replace with the address ##
+## which should receive any error reports ##
+############################################
+#email_to = admin@localhost
+#smtp_server = mail.server.com
+#error_email_from = paste_error@localhost
+#smtp_username = 
+#smtp_password = 
+#error_message = 'hp-app crash !'
 
 [server:main]
+##nr of threads to spawn
+threadpool_workers = 5
+
+##max request before thread respawn
+threadpool_max_requests = 2
+
+##option to use threads of process
+use_threadpool = true
+
 use = egg:Paste#http
-host = 0.0.0.0
-port = 5000
+host = 127.0.0.1
+port = 8001
 
 [app:main]
 use = egg:pylons_app
 full_stack = true
-static_files = true
-
+static_files = false
+lang=en
 cache_dir = %(here)s/data
-beaker.session.key = pylons_app
-beaker.session.secret = ${app_instance_secret}
 app_instance_uuid = ${app_instance_uuid}
 
-# If you'd like to fine-tune the individual locations of the cache data dirs
-# for the Cache data, or the Session saves, un-comment the desired settings
-# here:
-#beaker.cache.data_dir = %(here)s/data/cache
-#beaker.session.data_dir = %(here)s/data/sessions
+####################################
+###         BEAKER CACHE        ####
+####################################
+beaker.cache.data_dir=/%(here)s/data/cache/data
+beaker.cache.lock_dir=/%(here)s/data/cache/lock
+beaker.cache.regions=super_short_term,short_term,long_term
+beaker.cache.long_term.type=memory
+beaker.cache.long_term.expire=36000
+beaker.cache.short_term.type=memory
+beaker.cache.short_term.expire=60
+beaker.cache.super_short_term.type=memory
+beaker.cache.super_short_term.expire=10
 
-# WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*
-# Debug mode will enable the interactive debugging tool, allowing ANYONE to
-# execute malicious code after an exception is raised.
+####################################
+###       BEAKER SESSION        ####
+####################################
+## Type of storage used for the session, current types are 
+## dbm, file, memcached, database, and memory. 
+## The storage uses the Container API 
+##that is also used by the cache system.
+beaker.session.type = file
+
+beaker.session.key = hg-app
+beaker.session.secret = ${app_instance_secret}
+beaker.session.timeout = 36000
+
+##auto save the session to not to use .save()
+beaker.session.auto = False
+
+##true exire at browser close
+#beaker.session.cookie_expires = 3600
+
+    
+################################################################################
+## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*  ##
+## Debug mode will enable the interactive debugging tool, allowing ANYONE to  ##
+## execute malicious code after an exception is raised.                       ##
+################################################################################
 set debug = false
 
+##################################
+###       LOGVIEW CONFIG       ###
+##################################
+logview.sqlalchemy = #faa
+logview.pylons.templating = #bfb
+logview.pylons.util = #eee
 
-# Logging configuration
+#########################################################
+### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
+#########################################################
+sqlalchemy.db1.url = sqlite:///%(here)s/hg_app.db
+#sqlalchemy.db1.echo = False
+#sqlalchemy.db1.pool_recycle = 3600
+sqlalchemy.convert_unicode = true
+
+################################
+### LOGGING CONFIGURATION   ####
+################################
 [loggers]
-keys = root
+keys = root, routes, pylons_app, sqlalchemy
 
 [handlers]
 keys = console
 
 [formatters]
-keys = generic
+keys = generic,color_formatter
 
+#############
+## LOGGERS ##
+#############
 [logger_root]
 level = INFO
 handlers = console
 
+[logger_routes]
+level = INFO
+handlers = console
+qualname = routes.middleware
+# "level = DEBUG" logs the route matched and routing variables.
+
+[logger_pylons_app]
+level = DEBUG
+handlers = console
+qualname = pylons_app
+propagate = 0
+
+[logger_sqlalchemy]
+level = ERROR
+handlers = console
+qualname = sqlalchemy.engine
+propagate = 0
+
+##############
+## HANDLERS ##
+##############
+
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
 level = NOTSET
-formatter = generic
+formatter = color_formatter
+
+################
+## FORMATTERS ##
+################
 
 [formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s
+format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %Y-%m-%d %H:%M:%S
+
+[formatter_color_formatter]
+class=pylons_app.lib.colored_formatter.ColorFormatter
+format= %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %Y-%m-%d %H:%M:%S
  No newline at end of file

setup.py

@@ -1,47 +1,47
 from pylons_app import get_version
 try:
     from setuptools import setup, find_packages
 except ImportError:
     from ez_setup import use_setuptools
     use_setuptools()
     from setuptools import setup, find_packages
 
 setup(
-    name='hg_app',
+    name='hg-app',
     version=get_version(),
     description='Mercurial repository serving and browsing app',
     keywords='mercurial web hgwebdir replacement serving hgweb',
     license='BSD',
     author='marcin kuzminski',
     author_email='[e-mail]',
     url='http://hg.python-works.com',
     install_requires=[
         "Pylons>=1.0.0",
         "SQLAlchemy>=0.6",
         "Mako>=0.3.2",
         "vcs>=0.1.4",
         "pygments>=1.3.0",
         "mercurial>=1.6",
         "pysqlite",
         "whoosh==1.0.0b9",
         "py-bcrypt",
     ],
     setup_requires=["PasteScript>=1.6.3"],
     packages=find_packages(exclude=['ez_setup']),
     include_package_data=True,
     test_suite='nose.collector',
     package_data={'pylons_app': ['i18n/*/LC_MESSAGES/*.mo']},
     message_extractors={'pylons_app': [
             ('**.py', 'python', None),
             ('templates/**.mako', 'mako', {'input_encoding': 'utf-8'}),
             ('public/**', 'ignore', None)]},
     zip_safe=False,
     paster_plugins=['PasteScript', 'Pylons'],
     entry_points="""
     [paste.app_factory]
     main = pylons_app.config.middleware:make_app
 
     [paste.app_install]
     main = pylons.util:PylonsInstaller
     """,
 )