multiSSH3 5.39__tar.gz → 5.40__tar.gz

{multissh3-5.39 → multissh3-5.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: multiSSH3
-Version: 5.39
+Version: 5.40
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan

{multissh3-5.39 → multissh3-5.40}/multiSSH3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: multiSSH3
-Version: 5.39
+Version: 5.40
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan

{multissh3-5.39 → multissh3-5.40}/multiSSH3.py

@@ -1,13 +1,21 @@
 #!/usr/bin/env python3
 __curses_available = False
+__resource_lib_available = False
 try:
 	import curses
 	__curses_available = True
 except ImportError:
 	pass
+try:
+	import resource
+	__resource_lib_available = True
+except ImportError:
+	pass
+
 import subprocess
 import threading
-import time,os
+import time
+import os
 import argparse
 from itertools import product
 import re
@@ -37,7 +45,7 @@ except AttributeError:
 		# If neither is available, use a dummy decorator
 		def cache_decorator(func):
 			return func
-version = '5.39'
+version = '5.40'
 VERSION = version
 
 CONFIG_FILE = '/etc/multiSSH3.config.json'	
@@ -352,26 +360,34 @@ if True:
 	__curses_current_color_pair_index = 2  # Start from 1, as 0 is the default color pair
 	__curses_color_table = {}
 	__curses_current_color_index = 10
+	__max_connections_nofile_limit_supported = 0
+	if __resource_lib_available:
+		# Get the current limits
+		_, __system_nofile_limit = resource.getrlimit(resource.RLIMIT_NOFILE)
+		# Set the soft limit to the hard limit
+		resource.setrlimit(resource.RLIMIT_NOFILE, (__system_nofile_limit, __system_nofile_limit))
+		__max_connections_nofile_limit_supported = int((__system_nofile_limit - 5) / 4.6)
 
 # Mapping of ANSI 4-bit colors to curses colors
-ANSI_TO_CURSES_COLOR = {
-	30: curses.COLOR_BLACK,
-	31: curses.COLOR_RED,
-	32: curses.COLOR_GREEN,
-	33: curses.COLOR_YELLOW,
-	34: curses.COLOR_BLUE,
-	35: curses.COLOR_MAGENTA,
-	36: curses.COLOR_CYAN,
-	37: curses.COLOR_WHITE,
-	90: curses.COLOR_BLACK,   # Bright Black (usually gray)
-	91: curses.COLOR_RED,     # Bright Red
-	92: curses.COLOR_GREEN,   # Bright Green
-	93: curses.COLOR_YELLOW,  # Bright Yellow
-	94: curses.COLOR_BLUE,    # Bright Blue
-	95: curses.COLOR_MAGENTA, # Bright Magenta
-	96: curses.COLOR_CYAN,    # Bright Cyan
-	97: curses.COLOR_WHITE    # Bright White
-}
+if __curses_available:
+	ANSI_TO_CURSES_COLOR = {
+		30: curses.COLOR_BLACK,
+		31: curses.COLOR_RED,
+		32: curses.COLOR_GREEN,
+		33: curses.COLOR_YELLOW,
+		34: curses.COLOR_BLUE,
+		35: curses.COLOR_MAGENTA,
+		36: curses.COLOR_CYAN,
+		37: curses.COLOR_WHITE,
+		90: curses.COLOR_BLACK,   # Bright Black (usually gray)
+		91: curses.COLOR_RED,     # Bright Red
+		92: curses.COLOR_GREEN,   # Bright Green
+		93: curses.COLOR_YELLOW,  # Bright Yellow
+		94: curses.COLOR_BLUE,    # Bright Blue
+		95: curses.COLOR_MAGENTA, # Bright Magenta
+		96: curses.COLOR_CYAN,    # Bright Cyan
+		97: curses.COLOR_WHITE    # Bright White
+	}
 # ------------ Exportable Help Functions ----------------
 # check if command sshpass is available
 _binPaths = {}
@@ -2437,9 +2453,12 @@ def run_command_on_hosts(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAUL
 	if not max_connections:
 		max_connections = 4 * os.cpu_count()
 	elif max_connections == 0:
-		max_connections = 1048576
+		max_connections = __max_connections_nofile_limit_supported
 	elif max_connections < 0:
 		max_connections = (-max_connections) * os.cpu_count()
+	if __max_connections_nofile_limit_supported > 0 and max_connections > __max_connections_nofile_limit_supported:
+		eprint(f"Warning: The number of maximum connections {max_connections} is larger than estimated limit {__max_connections_nofile_limit_supported} from ulimit nofile limit {__system_nofile_limit}, setting the maximum connections to {__max_connections_nofile_limit_supported}.")
+		max_connections = __max_connections_nofile_limit_supported
 	if not commands:
 		commands = []
 	else:

{multissh3-5.39 → multissh3-5.40}/setup.py

@@ -1,8 +1,9 @@
 from setuptools import setup
+from multiSSH3 import version
 
 setup(
     name='multiSSH3',
-    version='5.39',
+    version=version,
     description='Run commands on multiple hosts via SSH',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',