eping 4.5__tar.gz → 4.7__tar.gz

{eping-4.5 → eping-4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eping
-Version: 4.5
+Version: 4.7
 Summary: Continuous ICMP reachability monitor built on fping, with a CSV logfile analyser (epinga)
 Author-email: Ewald Jeitler <ewald@jeitler.cc>
 License: GPL-3.0-or-later
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file
 
-# eping.py 4.05
+# eping.py 4.07
 
 Continuous ICMP reachability monitor built on `fping`. Scans a host list in a loop,
 reports each host UP/DOWN/NO-DNS, counts state changes. CLI (curses) or web GUI.

{eping-4.5 → eping-4.7}/README.md

@@ -1,4 +1,4 @@
-# eping.py 4.05
+# eping.py 4.07
 
 Continuous ICMP reachability monitor built on `fping`. Scans a host list in a loop,
 reports each host UP/DOWN/NO-DNS, counts state changes. CLI (curses) or web GUI.

{eping-4.5 → eping-4.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "eping"
-version = "4.05"
+version = "4.07"
 description = "Continuous ICMP reachability monitor built on fping, with a CSV logfile analyser (epinga)"
 readme = "README.md"
 license = { text = "GPL-3.0-or-later" }

{eping-4.5 → eping-4.7}/src/eping/eping.py

@@ -7,7 +7,7 @@
 # I knew how it worked.
 # Now, only god knows it!
 # - - - - - - - - - - - - - - - - - - - - - - - -
-VERSION = '4.05'
+VERSION = '4.07'
 version = VERSION  # legacy alias (kept for existing references)
 
 # --- scaling limits ---
@@ -956,7 +956,7 @@ def ssh_apply_pending():
         return
     old = SOURCE_LABEL
     ssh_activate(p if p is not False else None)
-    _source_events.append('SOURCE SWITCH %s -> %s' % (old, SOURCE_LABEL))
+    _source_events.append((get_date_time(), 'SOURCE SWITCH %s -> %s' % (old, SOURCE_LABEL)))
 
 def ssh_init(target, key, hostkey='accept-new', resolve=True):
     """-ssh at startup: ask for the secret, trust the host key (ssh's own prompt), verify
@@ -1065,8 +1065,8 @@ def source_set(down, reason=''):
     if down != _source_down:
         _source_down = down
         # logged as a comment row (shown in epinga.py's comment timeline)
-        _source_events.append(('JUMPHOST %s OFFLINE: %s' % (SOURCE_LABEL, reason)) if down
-                              else ('JUMPHOST %s ONLINE again' % SOURCE_LABEL))
+        _source_events.append((get_date_time(), ('JUMPHOST %s OFFLINE: %s' % (SOURCE_LABEL, reason)) if down
+                              else ('JUMPHOST %s ONLINE again' % SOURCE_LABEL)))
 
 _fping_caps = None
 def fping_capabilities():
@@ -2624,7 +2624,7 @@ def update_host_state(host_state, fping_result_data_sorted, tz_offset,
     now_str = get_date_time()
     while _source_events:
         _ev = _source_events.pop(0)
-        write_log_comment(logging_enabled, logfile_file_name, _ev, tz_offset)   # shown in the report's comment timeline
+        write_log_comment(logging_enabled, logfile_file_name, _ev[1], tz_offset, now_str=_ev[0])   # time of the event, not of the write   # shown in the report's comment timeline
     if down_streak is None:
         down_streak = {}
     # process in real chronological order (not the IP/hostname sort order the caller
@@ -2730,7 +2730,7 @@ def neutralize_csv_formula(text):
         return "'" + text
     return text
 
-def write_log_comment(logging_enabled, logfile_file_name, comment_text, tz_offset=0):
+def write_log_comment(logging_enabled, logfile_file_name, comment_text, tz_offset=0, now_str=None):
     """Append a free-text, timestamped comment row to the CSV log (if logging is on).
 
     Uses the sentinel HOSTNAME '#COMMENT#' so epinga.py can split these rows out
@@ -2742,7 +2742,7 @@ def write_log_comment(logging_enabled, logfile_file_name, comment_text, tz_offse
     """
     if not logging_enabled or not comment_text:
         return False
-    now_str = get_date_time()
+    now_str = now_str or get_date_time()
     ts = datetime.datetime.strptime(now_str, "%d/%m/%Y %H:%M:%S")
     if tz_offset:
         ts = ts + datetime.timedelta(hours=tz_offset)
@@ -7009,7 +7009,20 @@ class EpingWebServer(socketserver.ThreadingMixIn, http.server.HTTPServer):
         pass
 
 
+def _port_in_use(bind_addr, port):
+    """True if a listener already answers on the address we are about to bind. BSD/macOS lets a
+    wildcard socket and a specific one share a port (SO_REUSEADDR), so bind() alone does not
+    detect another instance bound to 127.0.0.1."""
+    host = {'': '127.0.0.1', '0.0.0.0': '127.0.0.1', '::': '::1'}.get(bind_addr, bind_addr)
+    try:
+        with socket.create_connection((host, port), timeout=0.5):
+            return True
+    except OSError:
+        return False
+
 def start_web_server(bind_addr, port):
+    if _port_in_use(bind_addr, port):
+        error_handler('ERROR: unable to bind web gui to ' + str(bind_addr) + ':' + str(port) + ' - address already in use')
     try:
         httpd = EpingWebServer((bind_addr, port), EpingWebHandler)
     except OSError as e:

{eping-4.5 → eping-4.7}/src/eping.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eping
-Version: 4.5
+Version: 4.7
 Summary: Continuous ICMP reachability monitor built on fping, with a CSV logfile analyser (epinga)
 Author-email: Ewald Jeitler <ewald@jeitler.cc>
 License: GPL-3.0-or-later
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file
 
-# eping.py 4.05
+# eping.py 4.07
 
 Continuous ICMP reachability monitor built on `fping`. Scans a host list in a loop,
 reports each host UP/DOWN/NO-DNS, counts state changes. CLI (curses) or web GUI.