[checkmk-commits] Order tables.

Module: check_mk Branch: master Commit: 85fa3a06d178320c75391fde50ad265895ac5576 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85fa3a06d17832… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Thu Feb 2 14:01:07 2017 +0100 Order tables. Change-Id: Ia63f67b7ad1bd441fd2d89fbe17f17d02f6ba158 --- livestatus/src/Store.cc | 26 +++++++++++++------------- livestatus/src/Store.h | 27 ++++++++++++++------------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 59abfc0..61528e1 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -56,28 +56,28 @@ Store::Store(MonitoringCore *core) : _core(core) , _logger(core->loggerLivestatus()) , _log_cache(_logger, _commands_holder, g_max_cached_messages) - , _table_contacts(_logger) + , _table_columns(_logger) , _table_commands(_commands_holder, _logger) + , _table_comments(_downtimes, _comments, core) + , _table_contactgroups(_core) + , _table_contacts(_logger) + , _table_downtimes(_downtimes, _comments, core) + , _table_eventconsoleevents(core, _downtimes, _comments) + , _table_eventconsolehistory(core, _downtimes, _comments) + , _table_eventconsolereplication(core) + , _table_eventconsolerules(core) + , _table_eventconsolestatus(core) , _table_hostgroups(_logger) , _table_hosts(_downtimes, _comments, core) , _table_hostsbygroup(_downtimes, _comments, core) + , _table_log(&_log_cache, _downtimes, _comments, core) , _table_servicegroups(_logger) , _table_services(_downtimes, _comments, core) , _table_servicesbygroup(_downtimes, _comments, core) , _table_servicesbyhostgroup(_downtimes, _comments, core) - , _table_timeperiods(_logger) - , _table_contactgroups(_core) - , _table_downtimes(_downtimes, _comments, core) - , _table_comments(_downtimes, _comments, core) - , _table_status(_logger) - , _table_log(&_log_cache, _downtimes, _comments, core) , _table_statehistory(&_log_cache, _downtimes, _comments, core) - , _table_columns(_logger) - , _table_eventconsoleevents(core, _downtimes, _comments) - , _table_eventconsolehistory(core, _downtimes, _comments) - , _table_eventconsolestatus(core) - , _table_eventconsolereplication(core) - , _table_eventconsolerules(core) { + , _table_status(_logger) + , _table_timeperiods(_logger) { addTable(&_table_columns); addTable(&_table_commands); addTable(&_table_comments); diff --git a/livestatus/src/Store.h b/livestatus/src/Store.h index 5e4e2df..1da5e9a 100644 --- a/livestatus/src/Store.h +++ b/livestatus/src/Store.h @@ -77,28 +77,29 @@ private: DowntimesOrComments _downtimes; DowntimesOrComments _comments; LogCache _log_cache; - TableContacts _table_contacts; + + TableColumns _table_columns; TableCommands _table_commands; + TableComments _table_comments; + TableContactGroups _table_contactgroups; + TableContacts _table_contacts; + TableDowntimes _table_downtimes; + TableEventConsoleEvents _table_eventconsoleevents; + TableEventConsoleHistory _table_eventconsolehistory; + TableEventConsoleReplication _table_eventconsolereplication; + TableEventConsoleRules _table_eventconsolerules; + TableEventConsoleStatus _table_eventconsolestatus; TableHostGroups _table_hostgroups; TableHosts _table_hosts; TableHostsByGroup _table_hostsbygroup; + TableLog _table_log; TableServiceGroups _table_servicegroups; TableServices _table_services; TableServicesByGroup _table_servicesbygroup; TableServicesByHostGroup _table_servicesbyhostgroup; - TableTimeperiods _table_timeperiods; - TableContactGroups _table_contactgroups; - TableDowntimes _table_downtimes; - TableComments _table_comments; - TableStatus _table_status; - TableLog _table_log; TableStateHistory _table_statehistory; - TableColumns _table_columns; - TableEventConsoleEvents _table_eventconsoleevents; - TableEventConsoleHistory _table_eventconsolehistory; - TableEventConsoleStatus _table_eventconsolestatus; - TableEventConsoleReplication _table_eventconsolereplication; - TableEventConsoleRules _table_eventconsolerules; + TableStatus _table_status; + TableTimeperiods _table_timeperiods; std::map<std::string, Table *> _tables;