Commits

Brent Tubbs committed 12d83b3

removed over-aggressive cleanup of supervisord includes

  • Participants
  • Parent commits dda4839
  • Tags 0.3.5

Comments (0)

Files changed (2)

 
 setup(
     name='silk-deployment',
-    version='0.3.4',
+    version='0.3.5',
     author='Brent Tubbs',
     author_email='brent.tubbs@gmail.com',
 	packages=find_packages(),
     # Note that Silk 0.3.0 and later does not require any changes from the
     # default supervisord.conf that ships with Ubuntu.  All files are included
     # in the supervisord's conf.d directory.
-    
+
     file = '/etc/supervisor/supervisord.conf'
 
     if contains(file, "files = /srv/\*/conf/supervisord.conf", use_sudo=True):
         _green("FIXING OLD SUPERVISOR CONFIG BUG")
         _yellow("See http://bits.btubbs.com/silk-deployment/issue/15/incorrect-supervisord-include-config-in")
-        
+
         bad = "\r\n".join([
             "files = /etc/supervisor/conf.d/*.conf",
             "files = /srv/*/conf/supervisord.conf"
 
         good = ("files = /etc/supervisor/conf.d/*.conf "
                 "/srv/*/conf/supervisord.conf\n")
-        
+
         txt = sudo('cat %s' % file)
 
         if bad in txt:
         if not exists(_join(SRV_ROOT, procname)):
             sudo('rm /tmp/%s' % sock)
 
-    # Clean up supervisord includes that have no associated site.  There
-    # shouldn't be any since stop_other_processes handles those, but you never
-    # know.
-    configs = [x for x in _list_dir('/etc/supervisor/conf.d') if _is_this_site(x)]
-    for config in configs:
-        sudo('rm %s' % _join('/etc/supervisor/conf.d', config))
-
     # TODO: clean out the pip-* folders that can build up in /tmp
     # TODO: figure out a way to clean out pybundle files in /srv/_silk_build
     # that aren't needed anymore.