Merge branch '2.2' into develop

This commit is contained in:
Markus Mäkelä
2018-05-16 11:46:45 +03:00
10 changed files with 183 additions and 365 deletions

View File

@ -1458,6 +1458,7 @@ static json_t* server_json_attributes(const SERVER* server)
json_object_set_new(stats, "connections", json_integer(server->stats.n_current));
json_object_set_new(stats, "total_connections", json_integer(server->stats.n_connections));
json_object_set_new(stats, "persistent_connections", json_integer(server->stats.n_persistent));
json_object_set_new(stats, "active_operations", json_integer(server->stats.n_current_ops));
json_object_set_new(stats, "routed_packets", json_integer(server->stats.packets));