From fe9d4fc48791a9c7793e5bd476a4a233ad5aea54 Mon Sep 17 00:00:00 2001 From: Matthew Li Date: Mon, 9 Feb 2026 19:15:30 -0800 Subject: [PATCH 1/2] Write API logs to same file as portal logs; remove configuration of log file --- bootstrap/ansible-almalinux8/playbook.yml | 9 --------- bootstrap/ansible/.env.tmpl | 1 - bootstrap/ansible/logrotate.tmpl | 2 +- bootstrap/ansible/main.copyme | 1 - bootstrap/ansible/playbook.yml | 9 --------- .../development/docker/config/brc_defaults.yml | 1 - .../development/docker/config/lrc_defaults.yml | 1 - coldfront/config/env_settings.py | 1 - coldfront/config/local_settings.py.sample | 14 +------------- 9 files changed, 2 insertions(+), 37 deletions(-) diff --git a/bootstrap/ansible-almalinux8/playbook.yml b/bootstrap/ansible-almalinux8/playbook.yml index ed9695e335..f4ebc0254c 100644 --- a/bootstrap/ansible-almalinux8/playbook.yml +++ b/bootstrap/ansible-almalinux8/playbook.yml @@ -304,15 +304,6 @@ owner: "{{ djangooperator }}" group: apache - - name: Create a log file for Django API logs - copy: - content: "" - force: false - dest: "{{ log_path }}/{{ api_log_file }}" - mode: 0660 - owner: "{{ djangooperator }}" - group: apache - # Create the Django MEDIA_ROOT directory and subdirectories for file # storage if required. diff --git a/bootstrap/ansible/.env.tmpl b/bootstrap/ansible/.env.tmpl index 925b602550..b3fc414624 100644 --- a/bootstrap/ansible/.env.tmpl +++ b/bootstrap/ansible/.env.tmpl @@ -65,7 +65,6 @@ DJANGO__DATABASES_DEFAULT_PORT=5432 # ----------------------------------------------------------------------------- HPCS__LOG_PATH={{ log_path }}/{{ portal_log_file }} -HPCS__API_LOG_PATH={{ log_path }}/{{ api_log_file }} {% if stream_logs_to_stdout is defined and stream_logs_to_stdout | bool -%} HPCS__STREAM_LOGS_TO_STDOUT=true {%- else -%} diff --git a/bootstrap/ansible/logrotate.tmpl b/bootstrap/ansible/logrotate.tmpl index 456020ec9e..c8dd660e9e 100644 --- a/bootstrap/ansible/logrotate.tmpl +++ b/bootstrap/ansible/logrotate.tmpl @@ -1,4 +1,4 @@ -{{ log_path }}/{{ api_log_file }} {{ log_path }}/{{ portal_log_file }} { +{{ log_path }}/{{ portal_log_file }} { weekly rotate 8 dateext diff --git a/bootstrap/ansible/main.copyme b/bootstrap/ansible/main.copyme index 3e9e8e3f0e..68cc63cd0e 100644 --- a/bootstrap/ansible/main.copyme +++ b/bootstrap/ansible/main.copyme @@ -57,7 +57,6 @@ redis_host: localhost # TODO: For LRC, use the substring 'cf_mylrc'. log_path: /var/log/user_portals/cf_mybrc portal_log_file: cf_mybrc_portal.log -api_log_file: cf_mybrc_api.log logrotate_entry_name: cf_mybrc diff --git a/bootstrap/ansible/playbook.yml b/bootstrap/ansible/playbook.yml index 17f19d5ea1..7389be6e3b 100644 --- a/bootstrap/ansible/playbook.yml +++ b/bootstrap/ansible/playbook.yml @@ -237,15 +237,6 @@ owner: "{{ djangooperator }}" group: apache - - name: Create a log file for Django API logs - copy: - content: "" - force: false - dest: "{{ log_path }}/{{ api_log_file }}" - mode: 0660 - owner: "{{ djangooperator }}" - group: apache - # Create the Django MEDIA_ROOT directory and subdirectories for file # storage if required. diff --git a/bootstrap/development/docker/config/brc_defaults.yml b/bootstrap/development/docker/config/brc_defaults.yml index 5155ffb3e5..95351ab98c 100644 --- a/bootstrap/development/docker/config/brc_defaults.yml +++ b/bootstrap/development/docker/config/brc_defaults.yml @@ -2,7 +2,6 @@ db_name: cf_brc_db log_path: /var/log/user_portals/cf_mybrc portal_log_file: cf_mybrc_portal.log -api_log_file: cf_mybrc_api.log logrotate_entry_name: cf_mybrc wsgi_conf_file_name: cf_mybrc_wsgi.conf diff --git a/bootstrap/development/docker/config/lrc_defaults.yml b/bootstrap/development/docker/config/lrc_defaults.yml index 93babfede9..72fd4da6a3 100644 --- a/bootstrap/development/docker/config/lrc_defaults.yml +++ b/bootstrap/development/docker/config/lrc_defaults.yml @@ -2,7 +2,6 @@ db_name: cf_lrc_db log_path: /var/log/user_portals/cf_mylrc portal_log_file: cf_mylrc_portal.log -api_log_file: cf_mylrc_api.log logrotate_entry_name: cf_mylrc wsgi_conf_file_name: cf_mylrc_wsgi.conf diff --git a/coldfront/config/env_settings.py b/coldfront/config/env_settings.py index 85be60af46..59a72e6462 100644 --- a/coldfront/config/env_settings.py +++ b/coldfront/config/env_settings.py @@ -82,7 +82,6 @@ } LOG_PATH = env('HPCS__LOG_PATH') -API_LOG_PATH = env('HPCS__API_LOG_PATH') STREAM_LOGS_TO_STDOUT = env.bool('HPCS__STREAM_LOGS_TO_STDOUT', default=True) diff --git a/coldfront/config/local_settings.py.sample b/coldfront/config/local_settings.py.sample index e53f21bb3d..d0fe937cf0 100644 --- a/coldfront/config/local_settings.py.sample +++ b/coldfront/config/local_settings.py.sample @@ -70,7 +70,6 @@ DISPLAY_TIME_ZONE = 'America/Los_Angeles' import os import structlog LOG_PATH = os.path.join('/var/log/user_portals/cf_mybrc', 'cf_mybrc_portal.log') -API_LOG_PATH = os.path.join('/var/log/user_portals/cf_mybrc', 'cf_mybrc_api.log') _log_formatter = 'console_dev' if DEBUG else 'json' LOGGING = { 'version': 1, @@ -112,12 +111,6 @@ LOGGING = { 'filename': LOG_PATH, 'formatter': 'json', }, - 'api_file': { - 'level': 'INFO', - 'class': 'logging.FileHandler', - 'filename': API_LOG_PATH, - 'formatter': 'json', - }, }, 'loggers': { 'django_auth_ldap': { @@ -130,7 +123,7 @@ LOGGING = { 'level': 'INFO', }, 'coldfront.api': { - 'handlers': ['api_file'], + 'handlers': ['file'], 'level': 'INFO', 'propagate': False, }, @@ -513,17 +506,12 @@ EXTRA_MIDDLEWARE += EXTRA_EXTRA_MIDDLEWARE # Update logging settings based on potentially-updated variables. LOGGING['handlers']['file']['filename'] = LOG_PATH -LOGGING['handlers']['api_file']['filename'] = API_LOG_PATH if STREAM_LOGS_TO_STDOUT: LOGGING['handlers']['file'] = { 'class': 'logging.StreamHandler', 'formatter': _log_formatter, } - LOGGING['handlers']['api_file'] = { - 'class': 'logging.StreamHandler', - 'formatter': _log_formatter, - } # Update allauth settings based on potentially-updated variables. SOCIALACCOUNT_PROVIDERS['cilogon']['APP']['client_id'] = CILOGON_APP_CLIENT_ID From d9bbcc1532991d6c0b9b0141eb4376309055e777 Mon Sep 17 00:00:00 2001 From: Matthew Li Date: Mon, 9 Feb 2026 19:53:46 -0800 Subject: [PATCH 2/2] Remove configuration of API log file in CI --- .github/workflows/django_testing_ci_python_3_13.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/django_testing_ci_python_3_13.yml b/.github/workflows/django_testing_ci_python_3_13.yml index d99c603f60..c4a36ae7bc 100644 --- a/.github/workflows/django_testing_ci_python_3_13.yml +++ b/.github/workflows/django_testing_ci_python_3_13.yml @@ -69,12 +69,10 @@ jobs: # Create log files sudo mkdir -p /var/log/user_portals/cf_mybrc sudo touch /var/log/user_portals/cf_mybrc/cf_mybrc_portal.log - sudo touch /var/log/user_portals/cf_mybrc/cf_mybrc_api.log # Modify log file permssions to allow testing to function properly sudo chmod 775 /var/log/user_portals/cf_mybrc sudo chmod 666 /var/log/user_portals/cf_mybrc/cf_mybrc_portal.log - sudo chmod 666 /var/log/user_portals/cf_mybrc/cf_mybrc_api.log # Give Apache permission to logs sudo chown -R :www-data /var/log/user_portals/cf_mybrc