Write coldfront.api logs to portal log

.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

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.
 

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 -%}

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

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
 

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.
 

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

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

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)
 

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