settings: removed not used supervisor views/models.

- this isn't going anywhere, and it's a dead code that has been
replaced by the processes page.

rhodecode/apps/admin/navigation.py

@@ -101,9 +101,6 b' class NavigationRegistry(object):'
         NavEntry('open_source', _('Open Source Licenses'),
                  'admin_settings_open_source', pyramid=True),
 
-        # TODO: marcink: we disable supervisor now until the supervisor stats
-        # page is fixed in the nix configuration
-        # NavEntry('supervisor', _('Supervisor'), 'admin_settings_supervisor'),
     ]
 
     _labs_entry = NavEntry('labs', _('Labs'), 'admin_settings_labs')

rhodecode/config/middleware.py

@@ -145,7 +145,9 b' def make_pyramid_app(global_config, **se'
 
     add_pylons_compat_data(config.registry, global_config, settings.copy())
 
+    # Static file view comes first
     includeme_first(config)
+
     includeme(config)
 
     pyramid_app = config.make_wsgi_app()

rhodecode/config/routing.py

@@ -241,11 +241,6 b' def make_map(config):'
         m.connect('admin_settings_search', '/settings/search',
                   action='settings_search', conditions={'method': ['GET']})
 
-        m.connect('admin_settings_supervisor', '/settings/supervisor',
-                  action='settings_supervisor', conditions={'method': ['GET']})
-        m.connect('admin_settings_supervisor_log', '/settings/supervisor/{procid}/log',
-                  action='settings_supervisor_log', conditions={'method': ['GET']})
-
         m.connect('admin_settings_labs', '/settings/labs',
                   action='settings_labs_update',
                   conditions={'method': ['POST']})

rhodecode/controllers/admin/settings.py

@@ -47,7 +47,6 b' from rhodecode.lib.celerylib import task'
 from rhodecode.lib.utils import repo2db_mapper
 from rhodecode.lib.utils2 import (
     str2bool, safe_unicode, AttributeDict, safe_int)
-from rhodecode.lib.compat import OrderedDict
 
 from rhodecode.model.db import RhodeCodeUi, Repository
 from rhodecode.model.forms import ApplicationSettingsForm, \
@@ -62,8 +61,6 b' from rhodecode.model.settings import ('
     IssueTrackerSettingsModel, VcsSettingsModel, SettingNotFound,
     SettingsModel)
 
-from rhodecode.model.supervisor import SupervisorModel, SUPERVISOR_MASTER
-
 
 log = logging.getLogger(__name__)
 
@@ -545,69 +542,6 b' class SettingsController(BaseController)'
         return render('admin/settings/settings.mako')
 
     @HasPermissionAllDecorator('hg.admin')
-    def settings_supervisor(self):
-        c.rhodecode_ini = rhodecode.CONFIG
-        c.active = 'supervisor'
-
-        c.supervisor_procs = OrderedDict([
-            (SUPERVISOR_MASTER, {}),
-        ])
-
-        c.log_size = 10240
-        supervisor = SupervisorModel()
-
-        _connection = supervisor.get_connection(
-            c.rhodecode_ini.get('supervisor.uri'))
-        c.connection_error = None
-        try:
-            _connection.supervisor.getAllProcessInfo()
-        except Exception as e:
-            c.connection_error = str(e)
-            log.exception("Exception reading supervisor data")
-            return render('admin/settings/settings.mako')
-
-        groupid = c.rhodecode_ini.get('supervisor.group_id')
-
-        # feed our group processes to the main
-        for proc in supervisor.get_group_processes(_connection, groupid):
-            c.supervisor_procs[proc['name']] = {}
-
-        for k in c.supervisor_procs.keys():
-            try:
-                # master process info
-                if k == SUPERVISOR_MASTER:
-                    _data = supervisor.get_master_state(_connection)
-                    _data['name'] = 'supervisor master'
-                    _data['description'] = 'pid %s, id: %s, ver: %s' % (
-                        _data['pid'], _data['id'], _data['ver'])
-                    c.supervisor_procs[k] = _data
-                else:
-                    procid = groupid + ":" + k
-                    c.supervisor_procs[k] = supervisor.get_process_info(_connection, procid)
-            except Exception as e:
-                log.exception("Exception reading supervisor data")
-                c.supervisor_procs[k] = {'_rhodecode_error': str(e)}
-
-        return render('admin/settings/settings.mako')
-
-    @HasPermissionAllDecorator('hg.admin')
-    def settings_supervisor_log(self, procid):
-        import rhodecode
-        c.rhodecode_ini = rhodecode.CONFIG
-        c.active = 'supervisor_tail'
-
-        supervisor = SupervisorModel()
-        _connection = supervisor.get_connection(c.rhodecode_ini.get('supervisor.uri'))
-        groupid = c.rhodecode_ini.get('supervisor.group_id')
-        procid = groupid + ":" + procid if procid != SUPERVISOR_MASTER else procid
-
-        c.log_size = 10240
-        offset = abs(safe_int(request.GET.get('offset', c.log_size))) * -1
-        c.log = supervisor.read_process_log(_connection, procid, offset, 0)
-
-        return render('admin/settings/settings.mako')
-
-    @HasPermissionAllDecorator('hg.admin')
     @auth.CSRFRequired()
     def settings_labs_update(self):
         """POST /admin/settings/labs: All items in the collection"""