Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2013-11-07 21:49:52 +01:00
parent e91de81471 7bf6c19f00
commit 54b445d906
4 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -72,6 +72,7 @@ v1.5.x (XXXX-XX-XX)
* added collection status "loading" * added collection status "loading"
v1.4.0 (2013-10-29) v1.4.0 (2013-10-29)
------------------- -------------------

2
Installation/Debian/postinst
View File

@ -17,7 +17,7 @@ Upgrading ArangoDB database files:
> /etc/init.d/arangodb upgrade > /etc/init.d/arangodb upgrade
Configuration file: Configuration file:
/etc/arangodb/arangod.conf /etc/arangodb/arangod-uid.conf
Start ArangoDB shell client: Start ArangoDB shell client:
> /usr/bin/arangosh > /usr/bin/arangosh

2
etc/systemd/arangodb.service
View File

@ -20,7 +20,7 @@ After=syslog.target network.target
Type=forking Type=forking
PIDFile=/var/run/arangodb/arangod.pid PIDFile=/var/run/arangodb/arangod.pid
ExecStartPre=/usr/bin/install -g arangodb -o arangodb -d /var/run/arangodb 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] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

31
js/actions/api-system.js
View File

@ -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 /// @fn JSF_get_admin_statistics
/// @brief returns system status information for the server /// @brief returns system status information for the server