python_pinger.git

@@ -11,10 +11,16 @@ import subprocess

 import time

 from argparse import ArgumentParser

 import threading

-import queue

+import signal

 printer_lock = threading.Lock()

+def log_exit(_signal, frame):

+    log(f'{time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())}'

+        f' PID={os.getpid()} signal={signal.Signals(_signal).name} Exiting.')

+    sys.exit(0)

+

+

 def pinger(host, delay):

     """Independent worker thread: repeatedly ping, check, print and sleep."""

     last_results = None

@@ -43,7 +49,7 @@ def log(*args, **kwargs):

 if __name__ == '__main__':

     parser = ArgumentParser(description="Repeatedly ping sites. Ex: %(prog)s -d 3 192.168.1.1 192.168.1.12")

-    parser.add_argument('-d', '--delay', type=float, default=1.0, help='Delay between pings')

+    parser.add_argument('-d', '--delay', type=float, default=3.0, help='Delay between pings')

     parser.add_argument('addresses', nargs='+', help='Addresses to ping')

     parser_args = parser.parse_args()

@@ -56,7 +62,10 @@ if __name__ == '__main__':

         _ping_cmd = ('ping', '-c', '1', '-W', '2', '-q')

     log(f'{time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())}'

-        f' PID={os.getpid()} repeat={parser_args.delay}s Starting')

+        f' PID={os.getpid()} repeat={parser_args.delay}s addresses={",".join(parser_args.addresses)} Starting')

+

+    signal.signal(signal.SIGINT, log_exit)

+    signal.signal(signal.SIGTERM, log_exit)

     # Create worker threads for all but one host address. (Saving one address for this thread.)

     for address in parser_args.addresses[:-1]:

@@ -12,6 +12,14 @@ import time

 from argparse import ArgumentParser

 import threading

 import queue

+import signal

+

+

+def log_exit(_signal, frame):

+    _print_queue.put([f'{time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())}'

+                      f' PID={os.getpid()} signal={signal.Signals(_signal).name} Exiting.'])

+    _print_queue.join()

+    sys.exit(0)

 def pinger(host, delay):

@@ -50,7 +58,7 @@ def log(*args, **kwargs):

 if __name__ == '__main__':

     parser = ArgumentParser(description="Repeatedly ping sites. Ex: %(prog)s -d 3 192.168.1.1 192.168.1.12")

-    parser.add_argument('-d', '--delay', type=float, default=1.0, help='Delay between pings')

+    parser.add_argument('-d', '--delay', type=float, default=3.0, help='Delay between pings')

     parser.add_argument('addresses', nargs='+', help='Addresses to ping')

     parser_args = parser.parse_args()

@@ -66,8 +74,11 @@ if __name__ == '__main__':

     print_thread = threading.Thread(target=print_manager, daemon=True)

     print_thread.start()

-    _print_queue.put([f'{time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())}'

-                      f' PID={os.getpid()} repeat={parser_args.delay}s Starting'])

+    _print_queue.put([f'{time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())} PID={os.getpid()}'

+        f' repeat={parser_args.delay}s addresses={",".join(parser_args.addresses)} Starting'])

+

+    signal.signal(signal.SIGINT, log_exit)

+    signal.signal(signal.SIGTERM, log_exit)

     # Create worker threads for all but one host address. (Saving one address for this thread.)

     for address in parser_args.addresses[:-1]:

@@ -12,10 +12,18 @@ import time

 from argparse import ArgumentParser

 import threading

 import queue

+import signal

 pinger_lock = threading.Lock()

+def log_exit(signal_, frame):

+    _print_queue.put([f'{time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())}'

+                      f' PID={os.getpid()} signal={signal.Signals(signal_).name} Exiting.'])

+    _print_queue.join()

+    sys.exit(0)

+

+

 def pinger():

     """Each queue item is a new address to ping. Ping and compare and print.

     Issue: Each of these threads reads from and writes to the global _results dict.

@@ -89,7 +97,11 @@ if __name__ == '__main__':

     del t

     _print_queue.put([f'{time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())}'

-                      f' PID={os.getpid()} repeat={delay}s Starting'])

+        f' PID={os.getpid()} repeat={delay}s addresses={",".join(parser_args.addresses)} Starting'])

+

+    signal.signal(signal.SIGINT, log_exit)

+    signal.signal(signal.SIGTERM, log_exit)

+

     while True:

         for address in _results.keys():

             _ping_queue.put(address)

@@ -12,10 +12,18 @@ import time

 from argparse import ArgumentParser

 import threading

 import queue

+import signal

 pinger_lock = threading.Lock()

+def log_exit(_signal, frame):

+    _print_queue.put([f'{time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())}'

+                      f' PID={os.getpid()} signal={signal.Signals(_signal).name} Exiting.'])

+    _print_queue.join()

+    sys.exit(0)

+

+

 def pinger(host):

     """Executes one ping, prints if there was a change, exits thread."""

     now = time.localtime()

@@ -53,7 +61,7 @@ def log(*args, **kwargs):

 if __name__ == '__main__':

     parser = ArgumentParser(description="Repeatedly ping sites. Ex: %(prog)s -d 3 192.168.1.1 192.168.1.12")

-    parser.add_argument('-d', '--delay', type=float, default=1.0, help='Delay between pings')

+    parser.add_argument('-d', '--delay', type=float, default=3.0, help='Delay between pings')

     parser.add_argument('addresses', nargs='+', help='Addresses to ping')

     parser_args = parser.parse_args()

@@ -74,8 +82,11 @@ if __name__ == '__main__':

     t.start()

     del t

+    signal.signal(signal.SIGINT, log_exit)

+    signal.signal(signal.SIGTERM, log_exit)

+

     _print_queue.put([f'{time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())}'

-                      f' PID={os.getpid()} repeat={delay}s Starting'])

+        f' PID={os.getpid()} repeat={delay}s addresses={",".join(parser_args.addresses)} Starting'])

     while True:

         for address in _results.keys():

             t = threading.Thread(target=pinger, args=(address,), daemon=True)