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

Remove redundant diagnostic output

Browse Source 
Readwritesplit had redundant parameter values in the
`router_diagnostics`. All module parameters with their current values are
already displayed in the `parameters` member of the resource.
This commit is contained in:
Markus Mäkelä
2018-05-02 09:02:24 +03:00
parent 4b95bbc7b8
commit 8a52478afa
1 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server/modules/routing/readwritesplit/readwritesplit.cc
View File

@ -393,39 +393,6 @@ json_t* RWSplit::diagnostics_json() const
{ {
json_t* rval = json_object(); json_t* rval = json_object();
json_object_set_new(rval, "use_sql_variables_in",
json_string(mxs_target_to_str(config().use_sql_variables_in)));
json_object_set_new(rval, "slave_selection_criteria",
json_string(select_criteria_to_str(config().slave_selection_criteria)));
json_object_set_new(rval, "master_failure_mode",
json_string(failure_mode_to_str(config().master_failure_mode)));
json_object_set_new(rval, "max_slave_replication_lag",
json_integer(config().max_slave_replication_lag));
json_object_set_new(rval, "retry_failed_reads",
json_boolean(config().retry_failed_reads));
json_object_set_new(rval, "strict_multi_stmt",
json_boolean(config().strict_multi_stmt));
json_object_set_new(rval, "strict_sp_calls",
json_boolean(config().strict_sp_calls));
json_object_set_new(rval, "disable_sescmd_history",
json_boolean(config().disable_sescmd_history));
json_object_set_new(rval, "max_sescmd_history",
json_integer(config().max_sescmd_history));
json_object_set_new(rval, "master_accept_reads",
json_boolean(config().master_accept_reads));
json_object_set_new(rval, "connection_keepalive",
json_integer(config().master_accept_reads));
json_object_set_new(rval, "enable_causal_read",
json_boolean(config().enable_causal_read));
json_object_set_new(rval, "causal_read_timeout",
json_string(config().causal_read_timeout.c_str()));
json_object_set_new(rval, "master_reconnection",
json_boolean(config().master_reconnection));
json_object_set_new(rval, "delayed_retry",
json_boolean(config().delayed_retry));
json_object_set_new(rval, "delayed_retry_timeout",
json_integer(config().delayed_retry_timeout));
json_object_set_new(rval, "connections", json_integer(stats().n_sessions)); json_object_set_new(rval, "connections", json_integer(stats().n_sessions));
json_object_set_new(rval, "current_connections", json_integer(service()->stats.n_current)); json_object_set_new(rval, "current_connections", json_integer(service()->stats.n_current));
json_object_set_new(rval, "queries", json_integer(stats().n_queries)); json_object_set_new(rval, "queries", json_integer(stats().n_queries));