From dcaf0ffcae3b99edc624829d6cfa8be44f88d28c Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Thu, 11 Oct 2012 00:05:02 +0200 Subject: [PATCH] issue #228 --- arangod/Documentation/api-system.dox | 8 -- js/actions/system/api-system.js | 133 --------------------------- 2 files changed, 141 deletions(-) diff --git a/arangod/Documentation/api-system.dox b/arangod/Documentation/api-system.dox index 1928573010..c8d1593608 100644 --- a/arangod/Documentation/api-system.dox +++ b/arangod/Documentation/api-system.dox @@ -35,8 +35,6 @@ ///
  • @ref HttpSystemStatus "GET /_admin/status"
  • ///
  • @ref HttpSystemConnectionStatistics "GET /_admin/connection-statistics"
  • ///
  • @ref HttpSystemRequestStatistics "GET /_admin/request-statistics"
  • -///
  • @ref HttpSystemConfigDescription "GET /_admin/config/description"
  • -///
  • @ref HttpSystemConfigConfiguration "GET /_admin/config/configuration"
  • /// /// /// @@ -61,12 +59,6 @@ /// /// @anchor HttpSystemRequestStatistics /// @copydetails triagens::arango::RequestStatisticsHandler::compute -/// -/// @anchor HttpSystemConfigDescription -/// @copydetails JSF_GET_admin_config_description -/// -/// @anchor HttpSystemConfigConfiguration -/// @copydetails JSF_GET_admin_config_configuration //////////////////////////////////////////////////////////////////////////////// // Local Variables: diff --git a/js/actions/system/api-system.js b/js/actions/system/api-system.js index 158a814ae4..b3c7cd6e58 100644 --- a/js/actions/system/api-system.js +++ b/js/actions/system/api-system.js @@ -243,139 +243,6 @@ actions.defineHttp({ } }); -//////////////////////////////////////////////////////////////////////////////// -/// @fn JSF_GET_admin_config_description -/// @brief returns configuration description -/// -/// @RESTHEADER{GET /_admin/config/description,reads the configuration desciption} -/// -/// @REST{GET /_admin/config/desciption} -/// -/// The call returns an object describing the configuration. -//////////////////////////////////////////////////////////////////////////////// - - actions.defineHttp({ - url : "_admin/config/description", - context : "admin", - - callback : function (req, res) { - try { - result = { - database : { - name : "Database", - type : "section", - - path : { - name : "Path", - type : "string", - readonly : true - }, - - access : { - name : "Combined Access", - type : "string", - readonly : true - } - }, - - logging : { - name : "Logging", - type : "section", - - level : { - name : "Log Level", - type : "pull-down", - values : [ "fatal", "error", "warning", "info", "debug", "trace" ] - }, - - syslog : { - name : "Use Syslog", - type : "boolean" - }, - - bufferSize : { - name : "Log Buffer Size", - type : "integer" - }, - - output : { - name : "Output", - type : "section", - - file : { - name : "Log File", - type : "string", - readonly : true - } - } - } - }; - - actions.resultOk(req, res, actions.HTTP_OK, result); - } - catch (err) { - actions.resultError(req, res, err); - } - } - }); - -//////////////////////////////////////////////////////////////////////////////// -/// @fn JSF_GET_admin_config_configuration -/// @brief returns configuration -/// -/// @RESTHEADER{GET /_admin/config/configuration,reads the configuration} -/// -/// @REST{GET /_admin/config/configuration} -/// -/// The call returns an object containing configuration. -//////////////////////////////////////////////////////////////////////////////// - - actions.defineHttp({ - url : "_admin/config/configuration", - context : "admin", - - callback : function (req, res) { - try { - result = { - database : { - path : { - value : "/tmp/emil/vocbase" - }, - - access : { - value : "localhost:8529" - } - }, - - logging : { - level : { - value : "info" - }, - - syslog : { - value : true - }, - - bufferSize : { - value : 100 - }, - - output : { - file : { - value : "/var/log/message/arango.log" - } - } - } - }; - - actions.resultOk(req, res, actions.HTTP_OK, result); - } - catch (err) { - actions.resultError(req, res, err); - } - } - }); - //////////////////////////////////////////////////////////////////////////////// /// @} ////////////////////////////////////////////////////////////////////////////////