mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
This commit is contained in:
commit
54b445d906
|
@ -72,6 +72,7 @@ v1.5.x (XXXX-XX-XX)
|
|||
|
||||
* added collection status "loading"
|
||||
|
||||
|
||||
v1.4.0 (2013-10-29)
|
||||
-------------------
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ Upgrading ArangoDB database files:
|
|||
> /etc/init.d/arangodb upgrade
|
||||
|
||||
Configuration file:
|
||||
/etc/arangodb/arangod.conf
|
||||
/etc/arangodb/arangod-uid.conf
|
||||
|
||||
Start ArangoDB shell client:
|
||||
> /usr/bin/arangosh
|
||||
|
|
|
@ -20,7 +20,7 @@ After=syslog.target network.target
|
|||
Type=forking
|
||||
PIDFile=/var/run/arangodb/arangod.pid
|
||||
ExecStartPre=/usr/bin/install -g arangodb -o arangodb -d /var/run/arangodb
|
||||
ExecStart=/usr/sbin/arangod -c /etc/arangodb/arangod.conf --pid-file /var/run/arangodb/arangod.pid --supervisor --uid arangodb
|
||||
ExecStart=/usr/sbin/arangod -c /etc/arangodb/arangod-uid.conf --pid-file /var/run/arangodb/arangod.pid --supervisor
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
|
@ -310,6 +310,37 @@ actions.defineHttp({
|
|||
}
|
||||
});
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// @fn JSF_get_admin_echo_database_name
|
||||
/// @brief returns the database name
|
||||
///
|
||||
/// @RESTHEADER{GET /_admin/database_name,returns the database name}
|
||||
///
|
||||
/// @RESTDESCRIPTION
|
||||
///
|
||||
/// The call returns an object with the following attributes:
|
||||
///
|
||||
/// - `name`: the name of the database
|
||||
///
|
||||
/// @RESTRETURNCODES
|
||||
///
|
||||
/// @RESTRETURNCODE{200}
|
||||
/// Name was returned successfully.
|
||||
///
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
actions.defineHttp({
|
||||
url : "_admin/database-name",
|
||||
context : "admin",
|
||||
prefix : true,
|
||||
|
||||
callback : function (req, res) {
|
||||
res.responseCode = actions.HTTP_OK;
|
||||
res.contentType = "application/json; charset=utf-8";
|
||||
res.body = JSON.stringify({ name: internal.db._name() });
|
||||
}
|
||||
});
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// @fn JSF_get_admin_statistics
|
||||
/// @brief returns system status information for the server
|
||||
|
|
Loading…
Reference in New Issue