# HG changeset patch # User Marcin Kuzminski # Date 2017-09-19 10:47:18 # Node ID d2ff8722ede8cebd2a3726d9711a96aca24be84f # Parent 021995626311b362443bc4f0eb717e6d606d9dea home: removed old pylons routes and convert them to pyramid ops app diff --git a/rhodecode/apps/ops/__init__.py b/rhodecode/apps/ops/__init__.py --- a/rhodecode/apps/ops/__init__.py +++ b/rhodecode/apps/ops/__init__.py @@ -36,6 +36,11 @@ def admin_routes(config): def includeme(config): config.include(admin_routes, route_prefix=ADMIN_PREFIX + '/ops') + # make OLD entries from pylons work + config.add_route( + name='ops_ping_legacy', pattern=ADMIN_PREFIX + '/ping') + config.add_route( + name='ops_error_test_legacy', pattern=ADMIN_PREFIX + '/error_test') # Scan module for configuration decorators. config.scan('.views', ignore='.tests') diff --git a/rhodecode/apps/ops/views.py b/rhodecode/apps/ops/views.py --- a/rhodecode/apps/ops/views.py +++ b/rhodecode/apps/ops/views.py @@ -41,6 +41,9 @@ class OpsView(BaseAppView): @view_config( route_name='ops_ping', request_method='GET', renderer='json_ext') + @view_config( + route_name='ops_ping_legacy', request_method='GET', + renderer='json_ext') def ops_ping(self): data = { 'instance': self.request.registry.settings.get('instance_id'), @@ -55,6 +58,9 @@ class OpsView(BaseAppView): @view_config( route_name='ops_error_test', request_method='GET', renderer='json_ext') + @view_config( + route_name='ops_error_test_legacy', request_method='GET', + renderer='json_ext') def ops_error_test(self): """ Test exception handling and emails on errors diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py --- a/rhodecode/config/routing.py +++ b/rhodecode/config/routing.py @@ -172,10 +172,6 @@ def make_map(config): # CUSTOM ROUTES HERE #========================================================================== - # ping and pylons error test - rmap.connect('ping', '%s/ping' % (ADMIN_PREFIX,), controller='home', action='ping') - rmap.connect('error_test', '%s/error_test' % (ADMIN_PREFIX,), controller='home', action='error_test') - # ADMIN REPOSITORY GROUPS ROUTES with rmap.submapper(path_prefix=ADMIN_PREFIX, controller='admin/repo_groups') as m: diff --git a/rhodecode/controllers/home.py b/rhodecode/controllers/home.py deleted file mode 100644 --- a/rhodecode/controllers/home.py +++ /dev/null @@ -1,67 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (C) 2010-2017 RhodeCode GmbH -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License, version 3 -# (only), as published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -# This program is dual-licensed. If you wish to learn more about the -# RhodeCode Enterprise Edition, including its added features, Support services, -# and proprietary license terms, please see https://rhodecode.com/licenses/ - -""" -Home controller for RhodeCode Enterprise -""" - -import logging -import time - -from pylons import tmpl_context as c - -from rhodecode.lib.auth import ( - LoginRequired, HasPermissionAllDecorator, - HasRepoGroupPermissionAnyDecorator) -from rhodecode.lib.base import BaseController, render - -from rhodecode.lib.ext_json import json -from rhodecode.model.db import Repository, RepoGroup -from rhodecode.model.repo import RepoModel -from rhodecode.model.repo_group import RepoGroupModel -from rhodecode.model.scm import RepoList, RepoGroupList - - -log = logging.getLogger(__name__) - - -class HomeController(BaseController): - def __before__(self): - super(HomeController, self).__before__() - - def ping(self): - """ - Ping, doesn't require login, good for checking out the platform - """ - instance_id = getattr(c, 'rhodecode_instanceid', '') - return 'pong[%s] => %s' % (instance_id, self.ip_addr,) - - @LoginRequired() - @HasPermissionAllDecorator('hg.admin') - def error_test(self): - """ - Test exception handling and emails on errors - """ - class TestException(Exception): - pass - - msg = ('RhodeCode Enterprise %s test exception. Generation time: %s' - % (c.rhodecode_name, time.time())) - raise TestException(msg)