hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix typo in server resource

Browse Source 
The 'statistics' was mistakenly written as 'statictics'.
This commit is contained in:
Markus Mäkelä
2017-06-26 23:21:15 +03:00
parent c91811bfca
commit 27d8212c51
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/REST-API/Resources-Server.md
View File

@ -72,7 +72,7 @@ Status: 200 OK
"slaves": [ // List of slave server IDs "slaves": [ // List of slave server IDs
3001 3001
], ],
"statictics": { // Server statistics "statistics": { // Server statistics
"connections": 0, "connections": 0,
"total_connections": 0, "total_connections": 0,
"active_operations": 0 "active_operations": 0
@ -156,7 +156,7 @@ Status: 200 OK
"slaves": [ "slaves": [
3001 3001
], ],
"statictics": { "statistics": {
"connections": 0, "connections": 0,
"total_connections": 0, "total_connections": 0,
"active_operations": 0 "active_operations": 0
@ -205,7 +205,7 @@ Status: 200 OK
"master_id": 3000, "master_id": 3000,
"replication_depth": 1, "replication_depth": 1,
"slaves": [], "slaves": [],
"statictics": { "statistics": {
"connections": 0, "connections": 0,
"total_connections": 0, "total_connections": 0,
"active_operations": 0 "active_operations": 0
@ -401,7 +401,7 @@ Response to `GET /v1/server/server1`:
3001, 3001,
3002 3002
], ],
"statictics": { "statistics": {
"connections": 0, "connections": 0,
"total_connections": 0, "total_connections": 0,
"active_operations": 0 "active_operations": 0

2
server/core/server.cc
View File

@ -1459,7 +1459,7 @@ static json_t* server_json_attributes(const SERVER* server)
json_object_set_new(stats, "total_connections", json_integer(server->stats.n_connections)); json_object_set_new(stats, "total_connections", json_integer(server->stats.n_connections));
json_object_set_new(stats, "active_operations", json_integer(server->stats.n_current_ops)); json_object_set_new(stats, "active_operations", json_integer(server->stats.n_current_ops));
json_object_set_new(attr, "statictics", stats); json_object_set_new(attr, "statistics", stats);
return attr; return attr;
} }

8
server/core/test/testjson.cc
View File

@ -82,7 +82,7 @@ const char* test1_json =
" 3002," " 3002,"
" 3003" " 3003"
" ]," " ],"
" \"statictics\": {" " \"statistics\": {"
" \"connections\": 0," " \"connections\": 0,"
" \"total_connections\": 0," " \"total_connections\": 0,"
" \"active_operations\": 0" " \"active_operations\": 0"
@ -136,7 +136,7 @@ const char* test1_json =
" \"master_id\": 3000," " \"master_id\": 3000,"
" \"replication_depth\": 1," " \"replication_depth\": 1,"
" \"slaves\": []," " \"slaves\": [],"
" \"statictics\": {" " \"statistics\": {"
" \"connections\": 0," " \"connections\": 0,"
" \"total_connections\": 0," " \"total_connections\": 0,"
" \"active_operations\": 0" " \"active_operations\": 0"
@ -190,7 +190,7 @@ const char* test1_json =
" \"master_id\": 3000," " \"master_id\": 3000,"
" \"replication_depth\": 1," " \"replication_depth\": 1,"
" \"slaves\": []," " \"slaves\": [],"
" \"statictics\": {" " \"statistics\": {"
" \"connections\": 0," " \"connections\": 0,"
" \"total_connections\": 0," " \"total_connections\": 0,"
" \"active_operations\": 0" " \"active_operations\": 0"
@ -244,7 +244,7 @@ const char* test1_json =
" \"master_id\": 3000," " \"master_id\": 3000,"
" \"replication_depth\": 1," " \"replication_depth\": 1,"
" \"slaves\": []," " \"slaves\": [],"
" \"statictics\": {" " \"statistics\": {"
" \"connections\": 0," " \"connections\": 0,"
" \"total_connections\": 0," " \"total_connections\": 0,"
" \"active_operations\": 0" " \"active_operations\": 0"