Skip to content
Extraits de code Groupes Projets
Valider 33215c0a rédigé par François De Keersmaeker's avatar François De Keersmaeker
Parcourir les fichiers

Use logging instead of print

parent 49b07b53
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -8,6 +8,11 @@ from .LogType import LogType
# Protocol translators
from .protocols.Protocol import Protocol
from .protocols.ip import ip
# Logging
import importlib
import logging
module_relative_path = importlib.import_module(__name__).__name__
logger = logging.getLogger(module_relative_path)
class Policy:
......@@ -73,7 +78,7 @@ class Policy:
profile_protocol = self.profile_data["protocols"][protocol_name]
protocol = Protocol.init_protocol(protocol_name, profile_protocol, self.device)
except ModuleNotFoundError:
print(f"Protocol {protocol_name} not found.")
logger.warning(f"Protocol {protocol_name} not found.")
# Unsupported protocol, skip it
continue
else:
......
......@@ -18,9 +18,13 @@ from .Policy import Policy
from .NFQueue import NFQueue
from pyyaml_loaders import IncludeLoader
# Package name
package = importlib.import_module(__name__).__name__.rpartition(".")[0]
module_relative_path = importlib.import_module(__name__).__name__
package = module_relative_path.rpartition(".")[0]
# Logging
import logging
logger = logging.getLogger(module_relative_path)
##### FUNCTIONS #####
......@@ -125,7 +129,7 @@ def validate_args(
try:
output_dir = directory(output_dir)
except ValueError:
print(f"Output directory {output_dir} does not exist. Using current directory.")
logger.warning(f"Output directory {output_dir} does not exist. Using current directory.")
output_dir = os.getcwd()
args["output_dir"] = output_dir
......@@ -461,4 +465,4 @@ def translate_profile(
write_firewall(device, global_accs, nfqueue_name, output_dir, drop_proba, log_type, log_group, test)
print(f"Done translating {profile_path}.")
logger.info(f"Done translating {profile_path}.")
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter