Skip to content

Commit 9d1d3e0

Browse files
committed
feat(flex-linux-setup): change admin-ui log location to /var/log/adminui
1 parent c817b55 commit 9d1d3e0

File tree

1 file changed

+28
-3
lines changed

1 file changed

+28
-3
lines changed

flex-linux-setup/flex_linux_setup/flex_setup.py

+28-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
from pathlib import Path
1818
from urllib import request
1919
from urllib.parse import urljoin
20+
from xml.etree import ElementTree
2021

2122

2223
argsp = None
@@ -281,7 +282,7 @@ def __init__(self):
281282

282283
self.jans_auth_dir = os.path.join(Config.jetty_base, jansAuthInstaller.service_name)
283284
self.jans_auth_custom_lib_dir = os.path.join(self.jans_auth_dir, 'custom/libs')
284-
285+
self.admin_ui_log_dir = '/var/log/adminui'
285286
self.gluu_admin_ui_source_path = os.path.join(Config.dist_jans_dir, 'gluu-admin-ui.zip')
286287
self.log4j2_adminui_path = os.path.join(Config.dist_jans_dir, 'log4j2-adminui.xml')
287288
self.log4j2_path = os.path.join(Config.dist_jans_dir, 'log4j2.xml')
@@ -526,8 +527,32 @@ def install_config_api_plugin(self):
526527
config_api_installer.copyFile(self.admin_ui_plugin_source_path, config_api_installer.libDir, backup=False)
527528
config_api_installer.add_extra_class(self.admin_ui_plugin_path)
528529

529-
for logfn in (self.log4j2_adminui_path, self.log4j2_path):
530-
config_api_installer.copyFile(logfn, config_api_installer.custom_config_dir)
530+
config_api_installer.copyFile(self.log4j2_path, config_api_installer.custom_config_dir)
531+
532+
log4j2_adminui_path_target_path = os.path.join(
533+
config_api_installer.custom_config_dir,
534+
os.path.basename(self.log4j2_adminui_path)
535+
)
536+
537+
print("Reading XML", self.log4j2_adminui_path)
538+
tree = ElementTree.parse(self.log4j2_adminui_path)
539+
root = tree.getroot()
540+
541+
for appenders in root.findall('Appenders'):
542+
for child in appenders:
543+
if child.tag=='RollingFile' and child.get('name') in ('ADMINUI-AUDIT', 'ADMINUI-LOG'):
544+
for prop in ('fileName', 'filePattern'):
545+
file_name = child.get(prop)
546+
if file_name:
547+
file_base_name = os.path.basename(file_name)
548+
new_file_path = os.path.join(self.admin_ui_log_dir, file_base_name)
549+
child.set(prop, new_file_path)
550+
print("Writing XML", log4j2_adminui_path_target_path)
551+
tree.write(log4j2_adminui_path_target_path, encoding='utf-8', xml_declaration=True)
552+
553+
if not os.path.exists(self.admin_ui_log_dir):
554+
os.makedirs(self.admin_ui_log_dir)
555+
config_api_installer.chown(self.admin_ui_log_dir, Config.jetty_user, Config.jetty_group)
531556

532557
config_api_installer.set_class_path(glob.glob(os.path.join(config_api_installer.libDir, '*.jar')))
533558

0 commit comments

Comments
 (0)