oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix properties

Browse Source
This commit is contained in:
Marek Wolan
2025-01-31 15:29:10 +00:00
parent 20e5177544
commit 8feb2db954
4 changed files with 16 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/primaite/game/agent/agent_log.py
View File

@@ -65,8 +65,9 @@ class AgentLog:
The logger is set to the DEBUG level, and is equipped with a handler that writes to a file and filters out
JSON-like messages.
"""
if not SIM_OUTPUT.save_agent_logs:
return
# TODO: uncomment this once we figure out why it's broken
# if not SIM_OUTPUT.save_agent_logs:
# return
log_path = self._get_log_path()
file_handler = logging.FileHandler(filename=log_path)

26
src/primaite/game/game.py
View File

@@ -406,32 +406,6 @@ class PrimaiteGame:
if "service_install_duration" in defaults_config:
new_service.install_duration = defaults_config["service_install_duration"]
# service-dependent options
if service_type == "DNSClient":
if "options" in service_cfg:
opt = service_cfg["options"]
if "dns_server" in opt:
new_service.dns_server = IPv4Address(opt["dns_server"])
if service_type == "DNSServer":
if "options" in service_cfg:
opt = service_cfg["options"]
if "domain_mapping" in opt:
for domain, ip in opt["domain_mapping"].items():
new_service.dns_register(domain, IPv4Address(ip))
if service_type == "DatabaseService":
if "options" in service_cfg:
opt = service_cfg["options"]
new_service.password = opt.get("db_password", None)
if "backup_server_ip" in opt:
new_service.configure_backup(backup_server=IPv4Address(opt.get("backup_server_ip")))
if service_type == "FTPServer":
if "options" in service_cfg:
opt = service_cfg["options"]
new_service.server_password = opt.get("server_password")
if service_type == "NTPClient":
if "options" in service_cfg:
opt = service_cfg["options"]
new_service.ntp_server = IPv4Address(opt.get("ntp_server_ip"))
if "applications" in node_cfg:
for application_cfg in node_cfg["applications"]:
new_application = None