Commits

Brent Tubbs  committed dda4839

a couple gunicorn config bugfixes. more flexible silk-config version dependency

  • Participants
  • Parent commits f30ae1a

Comments (0)

Files changed (3)

 
 setup(
     name='silk-deployment',
-    version='0.3.3',
+    version='0.3.4',
     author='Brent Tubbs',
     author_email='brent.tubbs@gmail.com',
 	packages=find_packages(),
         'CherryPy',
         'Fabric >= 1.0.1',
         'PyYAML',
-        'silk-config==0.3.3',
+        'silk-config>=0.3.3,<0.4',
 	],
     url='http://bits.btubbs.com/silk-deployment',
     license='LICENSE.txt',

File silk/fabfile.py

     if 'gunicorn' in env.config:
         env.config['bind'] = env.config['gunicorn'].get('bind', env.default_bind)
     else:
-        env.config['bind'] = default_bind 
+        env.config['bind'] = env.default_bind 
 
 _set_vars()
 
 from app_container import *
 
 GUNICORN_DEFAULTS = {
-    'workers': 2,
+    'workers': 1,
     'log-level': 'info',
     'name': 'gunicorn',
     'debug': 'false',
     gunicorn cmd line needed to run the site"""
     site_config = site_env['config']
     gconfig = copy.copy(GUNICORN_DEFAULTS)
-    gconfig.update(site_config['gunicorn'])
+    gconfig = site_config.get('gunicorn', GUNICORN_DEFAULTS)
 
     # Default to using a unix socket for nginx->gunicorn
     if 'deployment' in site_env: