X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Fconfig%2Fenvironment.py;h=c6ba9f0c0eb9cb30b400900d333ef7dbcac42786;hb=25e0dd950ef119f1bf6b7ab0a54c730f4f9f5922;hp=0f8f226af31e22ae69ad33c447d2dd97ac16566e;hpb=22bb3f405f829419b9f598ab5bbf3e534b623746;p=bluechips.git

diff --git a/bluechips/config/environment.py b/bluechips/config/environment.py
index 0f8f226..c6ba9f0 100644
--- a/bluechips/config/environment.py
+++ b/bluechips/config/environment.py
@@ -4,6 +4,7 @@ import os
 from mako.lookup import TemplateLookup
 from pylons import config
 from sqlalchemy import engine_from_config
+from mailer import Mailer
 
 import bluechips.lib.app_globals as app_globals
 import bluechips.lib.helpers
@@ -37,8 +38,13 @@ def load_environment(global_conf, app_conf):
         default_filters=['escape'])
     
     # Setup SQLAlchemy database engine
-    engine = engine_from_config(config, 'sqlalchemy.', pool_recycle=3600)
+    engine = engine_from_config(config, 'sqlalchemy.')
     init_model(engine)
     
     # CONFIGURATION OPTIONS HERE (note: all config options will override
     # any Pylons config options)
+    config['pylons.app_globals'].mailer = Mailer(config.get('mailer.host',
+                                                            '127.0.0.1'))
+    if 'mailer.user' in config:
+        config['pylons.app_globals'].mailer.login(config['mailer.user'],
+                                                  config['mailer.password'])