[checkmk-commits] Synch order of methods with superclass.

Sven Panne sp at mathias-kettner.de
Mon Apr 8 11:00:24 CEST 2019


Module: check_mk
Branch: master
Commit: dffa08cc2ca4739dac1699a7d94d379780524320
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dffa08cc2ca4739dac1699a7d94d379780524320

Author: Sven Panne <sp at mathias-kettner.de>
Date:   Mon Apr  8 10:45:41 2019 +0200

Synch order of methods with superclass.

Change-Id: Ifa52704d08f97a2853c492b4031312a91f862d80

---

 livestatus/src/MonitoringCore.h |  1 +
 livestatus/src/module.cc        | 17 +++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/livestatus/src/MonitoringCore.h b/livestatus/src/MonitoringCore.h
index 36b3387..7262617 100644
--- a/livestatus/src/MonitoringCore.h
+++ b/livestatus/src/MonitoringCore.h
@@ -110,6 +110,7 @@ public:
     virtual std::string pnpPath() = 0;
     virtual std::string historyFilePath() = 0;
     virtual std::string logArchivePath() = 0;
+
     virtual Encoding dataEncoding() = 0;
     virtual size_t maxResponseSize() = 0;
     virtual size_t maxCachedMessages() = 0;
diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc
index b8997e7..7093cbf 100644
--- a/livestatus/src/module.cc
+++ b/livestatus/src/module.cc
@@ -585,10 +585,6 @@ public:
                            const_cast<char *>(service_description.c_str())));
     }
 
-    bool host_has_contact(const Host *host, const Contact *contact) override {
-        return is_authorized_for(this, toImpl(contact), toImpl(host), nullptr);
-    }
-
     ContactGroup *find_contactgroup(const std::string &name) override {
         // Older Nagios headers are not const-correct... :-P
         return fromImpl(::find_contactgroup(const_cast<char *>(name.c_str())));
@@ -599,6 +595,10 @@ public:
         return fromImpl(::find_contact(const_cast<char *>(name.c_str())));
     }
 
+    bool host_has_contact(const Host *host, const Contact *contact) override {
+        return is_authorized_for(this, toImpl(contact), toImpl(host), nullptr);
+    }
+
     bool is_contact_member_of_contactgroup(const ContactGroup *group,
                                            const Contact *contact) override {
         // Older Nagios headers are not const-correct... :-P
@@ -614,6 +614,10 @@ public:
         return std::chrono::system_clock::from_time_t(last_log_rotation);
     }
 
+    size_t maxLinesPerLogFile() const override {
+        return fl_max_lines_per_logfile;
+    }
+
     Command find_command(const std::string &name) const override {
         // Older Nagios headers are not const-correct... :-P
         if (command *cmd = ::find_command(const_cast<char *>(name.c_str()))) {
@@ -622,10 +626,6 @@ public:
         return {"", ""};
     }
 
-    size_t maxLinesPerLogFile() const override {
-        return fl_max_lines_per_logfile;
-    }
-
     std::vector<Command> commands() const override {
         extern command *command_list;
         std::vector<Command> commands;
@@ -676,6 +676,7 @@ public:
         extern char *log_archive_path;
         return log_archive_path;
     }
+
     Encoding dataEncoding() override { return fl_data_encoding; }
     size_t maxResponseSize() override { return fl_max_response_size; }
     size_t maxCachedMessages() override { return fl_max_cached_messages; }



More information about the checkmk-commits mailing list