ladyrick 0.5.5__py3-none-any.whl → 0.5.6__py3-none-any.whl

ladyrick/cli/multi_ssh.py

@@ -52,14 +52,14 @@ def remote_head():
     def handle_signal(sig, frame=None):
         if sig == signal.SIGUSR2:
             # SIGUSR2 trigger force_kill manually
-            print("SIGUSR2 received. force kill")
+            log("SIGUSR2 received. force kill")
             force_kill(child, child_pgid)
         else:
-            print(f"forward signal {sig} to {child.pid}")
+            log(f"forward signal {sig} to {child.pid}")
             try:
                 os.kill(child.pid, sig)
             except ProcessLookupError as e:
-                print(str(e))
+                log(str(e))
 
     for sig in [signal.SIGHUP, signal.SIGINT, signal.SIGTERM, signal.SIGUSR1, signal.SIGUSR2]:
         signal.signal(sig, handle_signal)
@@ -202,12 +202,17 @@ class RemoteExecutor:
             except (BrokenPipeError, OSError) as e:
                 log(e)
 
+    def terminate(self):
+        if self.process is not None and self.process.poll() is None:
+            log("terminate RemoteExecutor")
+            self.process.terminate()
+
     def poll(self):
         assert self.process is not None
         return self.process.poll()
 
 
-def signal_repeat_checker(sig_to_check, count, duration):
+def signal_repeat_checker(sig_to_check, duration: float):
     last_int_signal_time = []
 
     def checker(sig: signal.Signals):
@@ -217,11 +222,8 @@ def signal_repeat_checker(sig_to_check, count, duration):
             threadhold = cur_time - duration
             last_int_signal_time = [t for t in last_int_signal_time if t >= threadhold]
             last_int_signal_time.append(cur_time)
-
-            if len(last_int_signal_time) >= count:
-                log(f"received {sig_to_check.name} for {count} times or more in {duration} second(s)")
-                return True
-        return False
+            return len(last_int_signal_time)
+        return 0
 
     return checker
 
@@ -290,16 +292,27 @@ def main():
     for executor in executors:
         executor.start()
 
-    checker = signal_repeat_checker(signal.SIGINT, count=3, duration=1)
+    import rich
+
+    checker = signal_repeat_checker(signal.SIGINT, duration=1)
 
     def handle_signal(sig, frame):
-        if checker(sig):
+        log(f"received signal {sig}")
+        sig_count = checker(sig)
+        if sig_count >= 3:
             sig = signal.SIGUSR2
-            log("\nTry to froce kill remote processes")
+            if sig_count == 3:
+                rich.print("\n[bold magenta]Can't wait. Try to froce kill remote processes...[/bold magenta]")
         else:
-            log(f"\nReceived {signal.Signals(sig).name}, forwarding...")
+            rich.print(
+                f"\n[bold green]Received {signal.Signals(sig).name}, forwarding to remote processes...[/bold green]"
+            )
         for executor in executors:
             executor.send_signal(sig)
+        if sig_count >= 4:
+            rich.print("\n[bold red]Really Can't wait!!! Froce kill local processes and exiting right now![/bold red]")
+            for executor in executors:
+                executor.terminate()
 
     for sig in [signal.SIGHUP, signal.SIGINT, signal.SIGTERM, signal.SIGUSR1, signal.SIGUSR2]:
         signal.signal(sig, handle_signal)

ladyrick/cli/test_signal.py

@@ -5,8 +5,8 @@ import time
 
 def handle_signal(sig, frame):
     print(f"received signal {sig}, {signal.Signals(sig).name}", flush=True)
-    # if sig in {signal.SIGTERM, signal.SIGINT, signal.SIGHUP}:
-        # sys.exit(0)
+    if sig in {signal.SIGTERM, signal.SIGINT, signal.SIGHUP}:
+        sys.exit(0)
 
 
 for sig in [s for s in vars(signal).values() if isinstance(s, signal.Signals)]:

{ladyrick-0.5.5.dist-info → ladyrick-0.5.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ladyrick
-Version: 0.5.5
+Version: 0.5.6
 Summary: ladyrick's tools
 Author-email: ladyrick <ladyrick@qq.com>
 License-Expression: MIT

{ladyrick-0.5.5.dist-info → ladyrick-0.5.6.dist-info}/RECORD

@@ -10,20 +10,20 @@ ladyrick/typing.py,sha256=YQeApe63dk7yL4NS5ytlR6v3dLCii2-qsXNlUvjK-zw,203
 ladyrick/utils.py,sha256=jRRaqC6kNbCJPGeE0YisFgis-wiuINLik1mcUQtytow,608
 ladyrick/vars.py,sha256=VbFh2u7XybUaBuiYEXBa4sOmoS99vc2AIXdYLBh8vjk,3763
 ladyrick/cli/calc.py,sha256=5_UhSSaL_K9FBCHg3zuCk41CHJXy3QAh__qCabbffQY,1438
-ladyrick/cli/multi_ssh.py,sha256=02DmcotlKGlaAEIgIi5KsnjBxkNnf60OiimpH20JfYU,9903
+ladyrick/cli/multi_ssh.py,sha256=d_7zPvmfVUQZVcxhCFj37ktTOb0-AzxSEr0z6ipMY9U,10403
 ladyrick/cli/psf.py,sha256=JLk3gbPn7E3uuPBbzGvLgJmFQlilA6zg_Xlg7xW5jik,1146
 ladyrick/cli/tee.py,sha256=UMJxSJLOEfbV43auVKRTIJ5ZAMAkAfj8byiFLk5PUHE,3579
 ladyrick/cli/test_args.py,sha256=f5sUPDlcf6nbNf6UfLwZQI5g5LN8wlFBQZ10GLw22cg,212
-ladyrick/cli/test_signal.py,sha256=zGPGMR81j1_vNyGEAcRtO2WjhDXiCj2xHMDATk-Z33M,494
+ladyrick/cli/test_signal.py,sha256=uvVLbHlvpmYgZcfRF9Lcte0OJJrMDDsmId3BpSxeaOA,490
 ladyrick/patch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ladyrick/patch/print.py,sha256=Ks_ONpeLOyC9pFKLmAiNliwGPbJyt9qz-cnRUPVto34,845
 ladyrick/patch/rich_print.py,sha256=z3Ea1VCunXZvNvEDFHpoyWc8ydINmh-gOIJ1ssscs6s,841
 ladyrick/patch/python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ladyrick/patch/python/__main__.py,sha256=BAGy1phd26WWcGM9TKHbqIpeZliVofopBndtMIPtDQ0,651
 ladyrick/patch/python/usercustomize.py,sha256=8mYpcZ8p-l41fiSJue727n8cAmcEmUktObDYZDdLJfs,218
-ladyrick-0.5.5.dist-info/licenses/LICENSE,sha256=EeNAFxYAOYEmo2YEM7Zk5Oknq4RI0XMAbk4Rgoem6fs,1065
-ladyrick-0.5.5.dist-info/METADATA,sha256=5F-dTbYGPoApk--A2gPS5cS_Ev4f3WRRRLKbPrYq4S8,883
-ladyrick-0.5.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ladyrick-0.5.5.dist-info/entry_points.txt,sha256=28kidI1OCOAi7S1aHBr8veak49VNZ0tWFvf-Ty8UmSU,225
-ladyrick-0.5.5.dist-info/top_level.txt,sha256=RIC3-Jty2qzLYXSOr7fOu1loTwlMU9cF6MFeGIROxWU,9
-ladyrick-0.5.5.dist-info/RECORD,,
+ladyrick-0.5.6.dist-info/licenses/LICENSE,sha256=EeNAFxYAOYEmo2YEM7Zk5Oknq4RI0XMAbk4Rgoem6fs,1065
+ladyrick-0.5.6.dist-info/METADATA,sha256=s-vKvkA34C7DS3PXt2QygfVzhmBxSJC42bawDe_QC8Q,883
+ladyrick-0.5.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ladyrick-0.5.6.dist-info/entry_points.txt,sha256=28kidI1OCOAi7S1aHBr8veak49VNZ0tWFvf-Ty8UmSU,225
+ladyrick-0.5.6.dist-info/top_level.txt,sha256=RIC3-Jty2qzLYXSOr7fOu1loTwlMU9cF6MFeGIROxWU,9
+ladyrick-0.5.6.dist-info/RECORD,,