# HG changeset patch # User Marcin Kuzminski # Date 2016-11-25 18:47:36 # Node ID fbf9ca8369bc11e5ff176bae3bf082919ad57a30 # Parent 9821bb6a23f1c7f4e7558351af1ea9b8e2afe3eb api: add backward compatible info required for rhodecode-index. diff --git a/rhodecode/api/tests/test_get_server_info.py b/rhodecode/api/tests/test_get_server_info.py --- a/rhodecode/api/tests/test_get_server_info.py +++ b/rhodecode/api/tests/test_get_server_info.py @@ -67,3 +67,12 @@ class TestGetServerInfo(object): expected['server'] = resp['result']['server'] assert_ok(id_, expected, given=response.body) + + def test_api_get_server_info_data_for_search_index_build(self): + id_, params = build_data(self.apikey, 'get_server_info') + response = api_call(self.app, params) + resp = response.json + + # required by indexer + assert resp['result']['index_storage'] + assert resp['result']['storage'] diff --git a/rhodecode/api/views/server_api.py b/rhodecode/api/views/server_api.py --- a/rhodecode/api/views/server_api.py +++ b/rhodecode/api/views/server_api.py @@ -60,7 +60,13 @@ def get_server_info(request, apiuser): if not has_superadmin_permission(apiuser): raise JSONRPCForbidden() - return ScmModel().get_server_info(request.environ) + server_info = ScmModel().get_server_info(request.environ) + # rhodecode-index requires those + + server_info['index_storage'] = server_info['search']['value']['location'] + server_info['storage'] = server_info['storage']['value']['path'] + + return server_info @jsonrpc_method()