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

jslint

This commit is contained in:
Heiko Kernbach 2014-05-16 13:01:34 +02:00
parent 4cb82ee0b1 6c496866b4
commit 969826af27
4 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arangosh/V8Client/arangodump.cpp
View File

@ -382,13 +382,11 @@ static string GetArangoVersion () {
static bool GetArangoIsCluster () {
map<string, string> headers;
string command = "return ArangoServerState.role();";
SimpleHttpResult* response = Client->request(HttpRequest::HTTP_REQUEST_POST,
"/_admin/execute?returnAsJSON=true",
command.c_str(),
command.size(),
headers);
SimpleHttpResult* response = Client->request(HttpRequest::HTTP_REQUEST_GET,
"/_admin/server/role",
"",
0,
headers);
if (response == 0 || ! response->isComplete()) {
if (response != 0) {
@ -401,8 +399,16 @@ static bool GetArangoIsCluster () {
string role = "UNDEFINED";
if (response->getHttpReturnCode() == HttpResponse::OK) {
// default value
role.assign(response->getBody().c_str(), response->getBody().length());
// convert response body to json
TRI_json_t* json = TRI_JsonString(TRI_UNKNOWN_MEM_ZONE,
response->getBody().c_str());
if (json != 0) {
// look up "server" value
role = JsonHelper::getStringValue(json, "role", "UNDEFINED");
TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, json);
}
}
else {
if (response->wasHttpError()) {
@ -414,7 +420,7 @@ static bool GetArangoIsCluster () {
delete response;
return role == "\"COORDINATOR\"";
return role == "COORDINATOR";
}
////////////////////////////////////////////////////////////////////////////////

26
arangosh/V8Client/arangorestore.cpp
View File

@ -376,13 +376,11 @@ static string GetArangoVersion () {
static bool GetArangoIsCluster () {
map<string, string> headers;
string command = "return ArangoServerState.role();";
SimpleHttpResult* response = Client->request(HttpRequest::HTTP_REQUEST_POST,
"/_admin/execute?returnAsJSON=true",
command.c_str(),
command.size(),
headers);
SimpleHttpResult* response = Client->request(HttpRequest::HTTP_REQUEST_GET,
"/_admin/server/role",
"",
0,
headers);
if (response == 0 || ! response->isComplete()) {
if (response != 0) {
@ -395,8 +393,16 @@ static bool GetArangoIsCluster () {
string role = "UNDEFINED";
if (response->getHttpReturnCode() == HttpResponse::OK) {
// default value
role.assign(response->getBody().c_str(), response->getBody().length());
// convert response body to json
TRI_json_t* json = TRI_JsonString(TRI_UNKNOWN_MEM_ZONE,
response->getBody().c_str());
if (json != 0) {
// look up "server" value
role = JsonHelper::getStringValue(json, "role", "UNDEFINED");
TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, json);
}
}
else {
if (response->wasHttpError()) {
@ -408,7 +414,7 @@ static bool GetArangoIsCluster () {
delete response;
return role == "\"COORDINATOR\"";
return role == "COORDINATOR";
}
////////////////////////////////////////////////////////////////////////////////

1
js/apps/system/aardvark/frontend/js/collections/arangoLogs.js
View File

@ -37,7 +37,6 @@
url: function() {
var type, rtnStr, offset, size;
offset = this.page * this.pagesize;
//var inverseOffset = this.totalAmount - (this.totalAmount % this.pagesize) - (this.pagesize * this.page);
var inverseOffset = this.totalAmount - ((this.page + 1) * this.pagesize);
if (inverseOffset < 0 && this.page === (this.totalPages - 1)) {
inverseOffset = 0;

5
js/apps/system/aardvark/frontend/js/views/logsView.js
View File

@ -69,9 +69,8 @@
},
invertArray: function (array) {
var rtnArr = [];
var counter = 0;
for (var i = array.length-1; i >= 0; i--) {
var rtnArr = [], counter = 0, i;
for (i = array.length-1; i >= 0; i--) {
rtnArr[counter] = array[i];
counter++;
}