warlock-manager 2.2.7__tar.gz → 2.2.9__tar.gz

{warlock_manager-2.2.7 → warlock_manager-2.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warlock-manager
-Version: 2.2.7
+Version: 2.2.9
 Summary: Dependency library for game-server management applications.
 Author-email: Charlie Powell <cdp1337@bitsnbytes.dev>
 Maintainer-email: Charlie Powell <cdp1337@bitsnbytes.dev>

{warlock_manager-2.2.7 → warlock_manager-2.2.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "warlock-manager"
-version = "2.2.7"
+version = "2.2.9"
 description = "Dependency library for game-server management applications."
 readme = "README.md"
 requires-python = ">=3.10"

{warlock_manager-2.2.7 → warlock_manager-2.2.9}/warlock_manager/apps/base_app.py

@@ -1,5 +1,4 @@
 import json
-import logging
 import os
 import shutil
 import time
@@ -17,6 +16,7 @@ if TYPE_CHECKING:
 from warlock_manager.libs.tui import prompt_yn, prompt_text
 from warlock_manager.libs import utils
 from warlock_manager.libs.ports import get_ports
+from warlock_manager.libs.logger import logger
 
 
 class BaseApp(ABC):
@@ -116,7 +116,7 @@ class BaseApp(ABC):
 			elif config.path:
 				# Doesn't exist, (that's fine),
 				# but the directory structure should be available to make it more simple for saving
-				self.ensure_file_parent_exists(config.path)
+				utils.ensure_file_parent_exists(config.path)
 
 	def save(self):
 		"""
@@ -150,7 +150,7 @@ class BaseApp(ABC):
 			if option in config.options:
 				return config.get_value(option)
 
-		logging.warning('Invalid option: %s, not present in game configuration!' % option)
+		logger.warning('Invalid option: %s, not present in game configuration!' % option)
 		return ''
 
 	def get_option_default(self, option: str) -> str:
@@ -163,7 +163,7 @@ class BaseApp(ABC):
 			if option in config.options:
 				return config.get_default(option)
 
-		logging.warning('Invalid option: %s, not present in game configuration!' % option)
+		logger.warning('Invalid option: %s, not present in game configuration!' % option)
 		return ''
 
 	def get_option_type(self, option: str) -> str:
@@ -176,7 +176,7 @@ class BaseApp(ABC):
 			if option in config.options:
 				return config.get_type(option)
 
-		logging.warning('Invalid option: %s, not present in game configuration!' % option)
+		logger.warning('Invalid option: %s, not present in game configuration!' % option)
 		return ''
 
 	def get_option_help(self, option: str) -> str:
@@ -189,7 +189,7 @@ class BaseApp(ABC):
 			if option in config.options:
 				return config.options[option].help
 
-		logging.warning('Invalid option: %s, not present in game configuration!' % option)
+		logger.warning('Invalid option: %s, not present in game configuration!' % option)
 		return ''
 
 	def option_value_updated(self, option: str, previous_value, new_value) -> bool | None:
@@ -226,18 +226,18 @@ class BaseApp(ABC):
 				post_result = self.option_value_updated(option, previous_value, new_value)
 				if post_result is True:
 					# Post-update either returned a successful operation or nothing at all, either is fine.
-					logging.info('Updated option %s to %s and ran post-update actions successfully' % (option, value))
+					logger.info('Updated option %s to %s and ran post-update actions successfully' % (option, value))
 					return True
 				elif post_result is None:
-					logging.debug('Post-update returned None, this is fine as it indicates no post-actions taken')
-					logging.info('Updated option %s to %s' % (option, value))
+					logger.debug('Post-update returned None, this is fine as it indicates no post-actions taken')
+					logger.info('Updated option %s to %s' % (option, value))
 					return True
 				else:
 					# Post-update explictly returned False, this indicates a problem occurred.
-					logging.warning('Configuration saved, but unable to complete post-update actions!')
+					logger.warning('Configuration saved, but unable to complete post-update actions!')
 					return False
 
-		logging.warning('Invalid option: %s, not present in game configuration!' % option)
+		logger.warning('Invalid option: %s, not present in game configuration!' % option)
 		return False
 
 	def get_option_options(self, option: str):
@@ -250,7 +250,7 @@ class BaseApp(ABC):
 			if option in config.options:
 				return config.get_options(option)
 
-		logging.warning('Invalid option: %s, not present in game configuration!' % option)
+		logger.warning('Invalid option: %s, not present in game configuration!' % option)
 		return []
 
 	def get_option_group(self, option: str):
@@ -263,7 +263,7 @@ class BaseApp(ABC):
 			if option in config.options:
 				return config.options[option].group
 
-		logging.warning('Invalid option: %s, not present in game configuration!' % option)
+		logger.warning('Invalid option: %s, not present in game configuration!' % option)
 		return 'Options'
 
 	def prompt_option(self, option: str):
@@ -376,11 +376,11 @@ class BaseApp(ABC):
 		"""
 
 		if action not in ['stop', 'restart', 'update']:
-			logging.error('Invalid action for delayed action: %s' % action)
+			logger.error('Invalid action for delayed action: %s' % action)
 			return
 
 		if os.geteuid() != 0:
-			logging.error('Unable to %s game service unless run with sudo' % action)
+			logger.error('Unable to %s game service unless run with sudo' % action)
 			return
 
 		msg = self.get_option_value('%s_delayed' % action)
@@ -391,7 +391,7 @@ class BaseApp(ABC):
 		services_running = []
 		services = self.get_services()
 
-		logging.info(
+		logger.info(
 			'Starting delayed %s action for all services, this gives current players up to an hour to log off safely' %
 			action
 		)
@@ -413,7 +413,7 @@ class BaseApp(ABC):
 
 					if player_count == 0 or player_count is None:
 						# No players online, stop the service
-						logging.info('Stopping %s as no players are online.' % service.service)
+						logger.info('Stopping %s as no players are online.' % service.service)
 						service.stop()
 					else:
 						# Still online, check to see if we should send a message
@@ -427,7 +427,7 @@ class BaseApp(ABC):
 							service.send_message(player_msg)
 
 			if minutes_left % 5 == 0 and minutes_left > 5:
-				logging.info('%s minutes remaining before %s.' % (str(minutes_left), action))
+				logger.info('%s minutes remaining before %s.' % (str(minutes_left), action))
 
 			if not still_running or minutes_left <= 0:
 				# No services are running, stop the timer
@@ -443,7 +443,7 @@ class BaseApp(ABC):
 			# Now that all services have been stopped, restart any that were running before
 			for service in services:
 				if service.service in services_running:
-					logging.info('Starting %s' % service.service)
+					logger.info('Starting %s' % service.service)
 					service.start()
 
 	def get_services(self) -> list['BaseService']:
@@ -659,7 +659,7 @@ class BaseApp(ABC):
 		for config in self.configs.values():
 			if config.path and os.path.exists(config.path):
 				os.remove(config.path)
-				logging.info('Removed config file for %s at %s' % (self.name, config.path))
+				logger.info('Removed config file for %s at %s' % (self.name, config.path))
 
 		# Cleanup directory structure
 		shutil.rmtree(os.path.join(utils.get_base_directory(), 'AppFiles'))

{warlock_manager-2.2.7 → warlock_manager-2.2.9}/warlock_manager/apps/steam_app.py

@@ -3,11 +3,11 @@ import re
 import sys
 import time
 from abc import ABC
-import logging
 
-from .base_app import BaseApp
+from warlock_manager.apps.base_app import BaseApp
 from warlock_manager.libs.cmd import Cmd
 from warlock_manager.libs import utils
+from warlock_manager.libs.logger import logger
 
 
 def guess_steamcmd_path() -> str:
@@ -21,7 +21,7 @@ def guess_steamcmd_path() -> str:
 	)
 	for path in paths:
 		if os.path.exists(path):
-			logging.debug('Found steamcmd at %s' % path)
+			logger.debug('Found steamcmd at %s' % path)
 			return path
 	raise FileNotFoundError('steamcmd not found in common locations. Please ensure steamcmd is installed.')
 
@@ -290,11 +290,11 @@ class SteamApp(BaseApp, ABC):
 			return []
 
 		if 'depots' not in info:
-			logging.warning(f"No depot information found for app {self.steam_id}.")
+			logger.warning(f"No depot information found for app {self.steam_id}.")
 			return []
 
 		if 'branches' not in info['depots']:
-			logging.warning(f"No branch information found for app {self.steam_id}.")
+			logger.warning(f"No branch information found for app {self.steam_id}.")
 			return []
 
 		return list(info['depots']['branches'].keys())
@@ -366,18 +366,18 @@ class SteamApp(BaseApp, ABC):
 
 		:return:
 		"""
-		logging.info('Updating game %s via Steam...' % self.name)
+		logger.info('Updating game %s via Steam...' % self.name)
 		# Stop any running services before updating
 		services = []
 		for service in self.get_services():
 			if service.is_running() or service.is_starting():
-				logging.info('Stopping service %s for update...' % service.service)
-				services.append(service.service)
+				logger.info('Stopping service %s for update...' % service.service)
+				services.append(service)
 				service.stop()
 
 		if len(services) > 0:
 			# Wait for all services to stop, may take 5 minutes if players are online.
-			logging.info('Waiting up to 5 minutes for all services to stop...')
+			logger.info('Waiting up to 5 minutes for all services to stop...')
 			counter = 0
 			while counter < 30:
 				all_stopped = True
@@ -390,7 +390,7 @@ class SteamApp(BaseApp, ABC):
 					break
 				time.sleep(10)
 		else:
-			logging.info('No running services found, proceeding with update...')
+			logger.info('No running services found, proceeding with update...')
 
 		cmd = Cmd([
 			guess_steamcmd_path(),
@@ -423,7 +423,7 @@ class SteamApp(BaseApp, ABC):
 		self.post_update()
 
 		if len(services) > 0:
-			logging.info('Update completed, restarting previously running services...')
+			logger.info('Update completed, restarting previously running services...')
 			for service in services:
 				service.start()
 

{warlock_manager-2.2.7 → warlock_manager-2.2.9}/warlock_manager/config/ini_config.py

@@ -3,9 +3,9 @@ from typing import Union
 import configparser
 import tempfile
 import os
-import logging
 
 from warlock_manager.config.base_config import BaseConfig
+from warlock_manager.libs.logger import logger
 
 
 class INIConfig(BaseConfig):
@@ -65,13 +65,13 @@ class INIConfig(BaseConfig):
 			section = self.group
 
 		if section is None:
-			logging.error(
+			logger.error(
 				'Cannot set INI config value for option %s because it does not have a section defined!' %
 				name
 			)
 			return
 
-		logging.debug('Setting INI config value: %s => [%s] %s = %s' % (name, section, opt.key, str_value))
+		logger.debug('Setting INI config value: %s => [%s] %s = %s' % (name, section, opt.key, str_value))
 
 		# Escape '%' characters that may be present
 		str_value = str_value.replace('%', '%%')
@@ -118,10 +118,10 @@ class INIConfig(BaseConfig):
 			if self.spoof_group:
 				with open(self.path, 'r') as f:
 					self.parser.read_string('[%s]\n' % self.group + f.read())
-				logging.debug('Loaded INI config %s with spoofed group: %s' % (self.path, self.group))
+				logger.debug('Loaded INI config %s with spoofed group: %s' % (self.path, self.group))
 			else:
 				self.parser.read(self.path)
-				logging.debug('Loaded INI config: %s' % self.path)
+				logger.debug('Loaded INI config: %s' % self.path)
 
 	def save(self):
 		"""

{warlock_manager-2.2.7 → warlock_manager-2.2.9}/warlock_manager/libs/app.py

@@ -1,4 +1,3 @@
-import logging
 import os
 import sys
 
@@ -9,6 +8,7 @@ from warlock_manager.libs.tui import print_header, Table, print_subheader, promp
 	prompt_long_text
 from warlock_manager.apps.base_app import BaseApp
 from warlock_manager.services.base_service import BaseService
+from warlock_manager.libs.logger import logger
 
 
 ICON_ENABLED = '✅'
@@ -223,11 +223,11 @@ def menu_mods(source: BaseService):
 				if add_help is not None:
 					add_help = add_help.strip().split('\n')[0].strip()
 				else:
-					logging.debug('Mod handler does not provide help for mods search.')
+					logger.debug('Mod handler does not provide help for mods search.')
 			else:
-				logging.debug('Mod handler does not support mods search.')
+				logger.debug('Mod handler does not support mods search.')
 		else:
-			logging.error('Mod handler is not available for this application.')
+			logger.error('Mod handler is not available for this application.')
 			return
 
 		counter = 0
@@ -435,7 +435,7 @@ def menu_service(service: BaseService):
 
 		if opt.isdigit() and 1 <= int(opt) <= counter:
 			if service.is_running():
-				logging.warning('Cannot configure options for a service while it is running.')
+				logger.warning('Cannot configure options for a service while it is running.')
 			else:
 				menu_config_option(service, options_ordered[int(opt) - 1])
 		elif opt == 'b':

{warlock_manager-2.2.7 → warlock_manager-2.2.9}/warlock_manager/libs/app_runner.py

@@ -1,31 +1,14 @@
 import json
 import logging
-import inspect
 import sys
 import typer
 from typing import Annotated
 from warlock_manager.apps.base_app import BaseApp
 from warlock_manager.services.base_service import BaseService
-from warlock_manager.libs.sensitive_data_filter import sensitive_data_filter
 from warlock_manager.libs.app import default_menu_main
 from warlock_manager.libs.meta import get_meta
 from warlock_manager.nexus.nexus import Nexus
-
-
-class ClassNameFilter(logging.Filter):
-	def filter(self, record):
-		# Try to get the class name from the call stack
-		frame = inspect.currentframe()
-		while frame:
-			if 'self' in frame.f_locals:
-				class_name = frame.f_locals['self'].__class__.__name__
-				if class_name not in ['ClassNameFilter', 'RootLogger']:
-					record.classname = frame.f_locals['self'].__class__.__name__
-					break
-			frame = frame.f_back
-		else:
-			record.classname = ''
-		return True
+from warlock_manager.libs.logger import logger
 
 
 def app_runner(game: BaseApp):
@@ -54,6 +37,7 @@ def app_runner(game: BaseApp):
 		:param value:
 		:return: BaseService | None
 		"""
+		logger.debug('Resolving service: %s' % value)
 		if value is None:
 			return None
 		services = game.get_services()
@@ -127,16 +111,10 @@ def app_runner(game: BaseApp):
 		debug: arg_debug = False
 	):
 		log_level = logging.DEBUG if debug else logging.INFO
-		logging.basicConfig(
-			level=log_level,
-			format='%(asctime)s [%(levelname)s] %(classname)s.%(funcName)s: %(message)s',
-			force=True
-		)
-		logging.getLogger().addFilter(ClassNameFilter())
-		logging.getLogger().addFilter(sensitive_data_filter)
+		logger.setLevel(log_level)
 
 		if debug:
-			logging.debug('Debug logging enabled')
+			logger.debug('Debug logging enabled')
 
 		# If no subcommand was provided, call main()
 		if ctx.invoked_subcommand is None:
@@ -257,7 +235,7 @@ def app_runner(game: BaseApp):
 			sys.exit(0 if service.backup(max_backups) else 1)
 		else:
 			if len(game.get_services()) == 0:
-				logging.warning('No services are available for backup, nothing to do.')
+				logger.warning('No services are available for backup, nothing to do.')
 				sys.exit(1)
 			success = True
 			for svc in game.get_services():
@@ -394,6 +372,7 @@ def app_runner(game: BaseApp):
 		:param service: BaseService | None
 		:return:
 		"""
+		logger.debug('Running get_metrics()')
 		nexus = Nexus()
 		if service and isinstance(service, BaseService):
 			services: list[BaseService] = [service]

{warlock_manager-2.2.7 → warlock_manager-2.2.9}/warlock_manager/libs/cmd.py

@@ -1,11 +1,11 @@
 import os
 import subprocess
 import json
-import logging
 import time
 import pwd
 
 from warlock_manager.libs import cache
+from warlock_manager.libs.logger import logger
 
 
 class CmdFakeResponse:
@@ -223,13 +223,13 @@ class Cmd:
 		:return:
 		"""
 		if self.result is None:
-			logging.debug('Running command: %s' % ' '.join(self.cmd))
+			logger.debug('Running command: %s' % ' '.join(self.cmd))
 			if self.memory_cacheable is not False:
 				key = ' '.join(self.cmd)
 				if key in self._memory_cache:
-					cached_time, cached = Cmd._memory_cache[key]
+					cached_time, cached, code = Cmd._memory_cache[key]
 					if cached_time + self.memory_cacheable >= time.time():
-						logging.debug('Using memory cached result instead')
+						logger.debug('Using memory cached result instead')
 						self.result = CmdFakeResponse(
 							cached if self.uses == 'stdout' else '',
 							cached if self.uses == 'stderr' else '',
@@ -240,7 +240,7 @@ class Cmd:
 			if self.cacheable is not False:
 				cached = self.try_cache()
 				if cached is not None:
-					logging.debug('Using cached result instead')
+					logger.debug('Using cached result instead')
 					self.result = CmdFakeResponse(
 						cached if self.uses == 'stdout' else '',
 						cached if self.uses == 'stderr' else '',
@@ -263,22 +263,23 @@ class Cmd:
 				self.result = CmdFakeResponse('', str(e), 1)
 			finally:
 				if self.result.stdout:
-					logging.debug('STDOUT: %s' % self.result.stdout.strip())
+					logger.debug('STDOUT: %s' % self.result.stdout.strip())
 				if self.result.stderr:
-					logging.debug('STDERR: %s' % self.result.stderr.strip())
-				logging.debug('Return code: %d' % self.result.returncode)
+					logger.debug('STDERR: %s' % self.result.stderr.strip())
+				logger.debug('Return code: %d' % self.result.returncode)
+
+		# Cache all responses to memory if requested, saves time on failed lookup checks.
+		if self.memory_cacheable is not False:
+			key = ' '.join(self.cmd)
+			if self.uses == 'stdout':
+				Cmd._memory_cache[key] = (time.time(), self.result.stdout, self.result.returncode)
+			elif self.uses == 'stderr':
+				Cmd._memory_cache[key] = (time.time(), self.result.stderr, self.result.returncode)
+			else:
+				logger.warning('Attempting to cache command output without capturing it. This is not supported!')
 
 		if self.result.returncode == 0:
-			# Check to see if this result should be cached on either the filesystem and/or memory
-			if self.memory_cacheable is not False:
-				key = ' '.join(self.cmd)
-				if self.uses == 'stdout':
-					Cmd._memory_cache[key] = (time.time(), self.result.stdout)
-				elif self.uses == 'stderr':
-					Cmd._memory_cache[key] = (time.time(), self.result.stderr)
-				else:
-					logging.warning('Attempting to cache command output without capturing it. This is not supported!')
-
+			# Successful executions can be cached to disk
 			if self.cacheable is not False:
 				# Do we save stdout or stderr?
 				if self.uses == 'stdout':
@@ -286,7 +287,7 @@ class Cmd:
 				elif self.uses == 'stderr':
 					cache.save_cache(' '.join(self.cmd), self.result.stderr)
 				else:
-					logging.warning('Attempting to cache command output without capturing it. This is not supported!')
+					logger.warning('Attempting to cache command output without capturing it. This is not supported!')
 
 		return self.result
 
@@ -323,10 +324,10 @@ class PipeCmd(Cmd):
 		if self.result is None:
 
 			if self.cacheable is not False:
-				logging.warning('Piped commands cannot be cached!')
+				logger.warning('Piped commands cannot be cached!')
 
 			try:
-				logging.debug('Running piped command: %s' % ' '.join(self.cmd))
+				logger.debug('Running piped command: %s' % ' '.join(self.cmd))
 				self.result = subprocess.Popen(
 					self.cmd,
 					cwd=self._cwd,
@@ -355,10 +356,10 @@ class BackgroundCmd(Cmd):
 		if self.result is None:
 
 			if self.cacheable is not False:
-				logging.warning('Background commands cannot be cached!')
+				logger.warning('Background commands cannot be cached!')
 
 			try:
-				logging.debug('Running background command: %s' % ' '.join(self.cmd))
+				logger.debug('Running background command: %s' % ' '.join(self.cmd))
 				self.result = subprocess.Popen(
 					self.cmd,
 					cwd=self._cwd,

{warlock_manager-2.2.7 → warlock_manager-2.2.9}/warlock_manager/libs/download.py

@@ -1,9 +1,9 @@
-import logging
 import requests
 import json
 from warlock_manager.libs import utils
 from warlock_manager.libs import cache
 from warlock_manager.libs.meta import get_meta
+from warlock_manager.libs.logger import logger
 
 # "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
 USER_AGENT = 'Warlock Manager/%s (warlock.nexus) <staff@bitsnbytes.dev>' % get_meta()['version']
@@ -18,7 +18,7 @@ def download_file(url: str, destination: str):
     :param destination: The local file path to save the downloaded file to
     :return:
     """
-    logging.debug('Downloading file %s to %s' % (url, destination))
+    logger.debug('Downloading file %s to %s' % (url, destination))
     # Ensure the target directory exists
     utils.ensure_file_parent_exists(destination)
 
@@ -44,7 +44,7 @@ def download_json(url: str) -> dict:
     :param url: The URL to download from
     :return: The JSON data as a dictionary
     """
-    logging.debug('Downloading JSON %s' % url)
+    logger.debug('Downloading JSON %s' % url)
 
     # Try the cache first
     cached = cache.get_cache(url)

{warlock_manager-2.2.7 → warlock_manager-2.2.9}/warlock_manager/libs/firewall.py

@@ -1,5 +1,5 @@
 from warlock_manager.libs.cmd import Cmd
-import logging
+from warlock_manager.libs.logger import logger
 
 
 class Firewall:
@@ -92,11 +92,11 @@ class Firewall:
 		"""
 
 		if port <= 0 or port >= 65536:
-			logging.error(f"Invalid port number: {port}")
+			logger.error(f"Invalid port number: {port}")
 			return False
 
 		if protocol.lower() not in ['tcp', 'udp']:
-			logging.error(f"Invalid protocol: {protocol}")
+			logger.error(f"Invalid protocol: {protocol}")
 			return False
 
 		firewall = cls.get_available()
@@ -104,20 +104,20 @@ class Firewall:
 		if firewall == 'ufw':
 			# UFW requires the protocol to be all lowercase.
 			protocol = protocol.lower()
-			logging.info(f"Allowing {port}/{protocol} via UFW")
+			logger.info(f"Allowing {port}/{protocol} via UFW")
 			cmd = Cmd(['ufw', 'allow', f'{port}/{protocol}'])
 			if comment:
 				cmd.extend(['comment', comment])
 			return cmd.success
 
 		elif firewall == 'firewalld':
-			logging.info(f"Allowing {port}/{protocol} via Firewalld")
+			logger.info(f"Allowing {port}/{protocol} via Firewalld")
 			if Cmd(['firewall-cmd', '--permanent', '--add-port', f'{port}/{protocol}']).success:
 				Cmd(['firewall-cmd', '--reload']).run()
 				return True
 
 		elif firewall == 'iptables':
-			logging.info(f"Allowing {port}/{protocol} via iptables")
+			logger.info(f"Allowing {port}/{protocol} via iptables")
 			cmd = Cmd(['iptables', '-A', 'INPUT', '-p', protocol, '--dport', str(port), '-j', 'ACCEPT'])
 			if comment:
 				cmd.extend(['-m', 'comment', '--comment', comment])
@@ -126,7 +126,7 @@ class Firewall:
 				return True
 
 		else:
-			logging.error('No supported firewall found on the system.')
+			logger.error('No supported firewall found on the system.')
 
 		return False
 
@@ -142,11 +142,11 @@ class Firewall:
 		"""
 
 		if port <= 0 or port >= 65536:
-			logging.error(f"Invalid port number: {port}")
+			logger.error(f"Invalid port number: {port}")
 			return False
 
 		if protocol.lower() not in ['tcp', 'udp']:
-			logging.error(f"Invalid protocol: {protocol}")
+			logger.error(f"Invalid protocol: {protocol}")
 			return False
 
 		firewall = cls.get_available()
@@ -165,7 +165,7 @@ class Firewall:
 				return True
 
 		else:
-			logging.error('No supported firewall found on the system.')
+			logger.error('No supported firewall found on the system.')
 
 		return False
 
@@ -219,5 +219,5 @@ class Firewall:
 			return False
 
 		else:
-			logging.error('No supported firewall found on the system.')
+			logger.error('No supported firewall found on the system.')
 			return True  # No firewall means it's probably enabled by default, so we return true.

{warlock_manager-2.2.7 → warlock_manager-2.2.9}/warlock_manager/libs/java.py

@@ -1,7 +1,6 @@
-import logging
-
 from warlock_manager.libs.version import extract_version_from_string, parse_version
 from warlock_manager.libs.cmd import Cmd
+from warlock_manager.libs.logger import logger
 
 
 def get_java_paths() -> list[str]:
@@ -50,7 +49,7 @@ def _check_java_versions(java_paths: list[str], target_version: int) -> str | No
 	:param target_version: The major Java version to find
 	:return: The path to the matching Java executable, or None if not found
 	"""
-	logging.debug('Searching for Java version %d' % target_version)
+	logger.debug('Searching for Java version %d' % target_version)
 	for java_path in java_paths:
 		result = Cmd([java_path, '-version'])
 		# Java version information is typically printed to stderr, so we need to use that instead of stdout.
@@ -62,7 +61,7 @@ def _check_java_versions(java_paths: list[str], target_version: int) -> str | No
 			# Use the version library to parse this version string.
 			version_str = extract_version_from_string(version_str)
 			version = parse_version(version_str)
-			logging.debug('%s => %s' % (java_path, version))
+			logger.debug('%s => %s' % (java_path, version))
 			if version.major == 1:
 				# For Java 8 and earlier, the version string starts with "1.", so we need to check the minor version
 				if version.minor == target_version: