Module: check_mk
Branch: master
Commit: ef654aabf1a316692fe4b695cafe837c63b9d249
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef654aabf1a316…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Nov 17 11:10:34 2017 +0100
Moved persisted info update logic to DataSource()
Change-Id: I8496b2a0ffadfa89734db2a6a0247178250b01f8
---
cmk_base/data_sources/abstract.py | 29 +++++++++++++++++++++--------
cmk_base/data_sources/host_info.py | 17 +----------------
cmk_base/data_sources/tcp.py | 2 +-
3 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py
index d17c938..7597d58 100644
--- a/cmk_base/data_sources/abstract.py
+++ b/cmk_base/data_sources/abstract.py
@@ -333,6 +333,27 @@ class DataSource(object):
self._logger.debug("[%s] Stored persisted sections: %s" % (self.id(),
", ".join(persisted_info.keys())))
+ def _update_info_with_persisted_info(self, host_info, hostname):
+ persisted_info = self._load_persisted_info(hostname)
+ if not persisted_info:
+ return host_info
+
+ for section_name, entry in persisted_info.items():
+ if len(entry) == 2:
+ continue # Skip entries of "old" format
+
+ persisted_from, persisted_until, section_info = entry
+
+ # Don't overwrite sections that have been received from the source with
this call
+ if section_name not in host_info.info:
+ self._logger.debug("[%s] Using persisted section %r" %
(self.id(), section_name))
+ host_info.add_cached_section(section_name, section_info, persisted_from,
persisted_until)
+ else:
+ self._logger.debug("[%s] Skipping persisted section %r" %
(self.id(), section_name))
+
+ return host_info
+
+
def _load_persisted_info(self, hostname):
file_path = self._persisted_info_file_path(hostname)
@@ -377,14 +398,6 @@ class DataSource(object):
return persisted_info
- def _update_info_with_persisted_info(self, host_info, hostname):
- persisted_info = self._load_persisted_info(hostname)
- if persisted_info:
- host_info.update_with_persisted_info(persisted_info,
-
use_outdated_sections=self._use_outdated_persisted_sections)
- return host_info
-
-
@classmethod
def use_outdated_persisted_sections(cls):
cls._use_outdated_persisted_sections = True
diff --git a/cmk_base/data_sources/host_info.py b/cmk_base/data_sources/host_info.py
index b51d490..b22f715 100644
--- a/cmk_base/data_sources/host_info.py
+++ b/cmk_base/data_sources/host_info.py
@@ -68,21 +68,6 @@ class HostInfo(object):
self.persisted_info.update(host_info.persisted_info)
- def _add_cached_section(self, section_name, section, persisted_from,
persisted_until):
+ def add_cached_section(self, section_name, section, persisted_from,
persisted_until):
self.cache_info[section_name] = (persisted_from, persisted_until -
persisted_from)
self.info[section_name] = section
-
-
- def update_with_persisted_info(self, persisted_info, use_outdated_sections):
- for section_name, entry in persisted_info.items():
- if len(entry) == 2:
- continue # Skip entries of "old" format
-
- persisted_from, persisted_until, section_info = entry
-
- # Don't overwrite sections that have been received from the source with
this call
- if section_name not in self.info:
- console.vverbose("Using persisted section %r\n" %
section_name)
- self._add_cached_section(section_name, section_info, persisted_from,
persisted_until)
- else:
- console.vverbose("Skipping persisted section %r\n" %
section_name)
diff --git a/cmk_base/data_sources/tcp.py b/cmk_base/data_sources/tcp.py
index 6827600..bc57405 100644
--- a/cmk_base/data_sources/tcp.py
+++ b/cmk_base/data_sources/tcp.py
@@ -86,7 +86,7 @@ class TCPDataSource(CheckMKAgentDataSource):
socket.SOCK_STREAM)
s.settimeout(config.tcp_connect_timeout)
- console.vverbose("Connecting via TCP to %s:%d.\n" % (ipaddress, port))
+ self._logger.debug("[%s] Connecting via TCP to %s:%d" % (self.id(),
ipaddress, port))
s.connect((ipaddress, port))
# Immediately close sending direction. We do not send any data
# s.shutdown(socket.SHUT_WR)