From 37523f2a01822968e35ee1f03600211a0bf81520 Mon Sep 17 00:00:00 2001 From: Kory Draughn Date: Thu, 11 Apr 2024 13:09:39 -0400 Subject: [PATCH] [7570] Bump server_config.json schema version for GenQuery2 log category. --- packaging/server_config.json.template | 3 ++- scripts/irods/upgrade_configuration.py | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packaging/server_config.json.template b/packaging/server_config.json.template index a2c00dee62..1063f03aea 100644 --- a/packaging/server_config.json.template +++ b/packaging/server_config.json.template @@ -1,6 +1,6 @@ { "schema_name": "server_config", - "schema_version": "v4", + "schema_version": "v5", "advanced_settings": { "agent_factory_watcher_sleep_time_in_seconds": 5, "default_number_of_transfer_threads": 4, @@ -49,6 +49,7 @@ "authentication": "info", "database": "info", "delay_server": "info", + "genquery2": "info", "legacy": "info", "microservice": "info", "network": "info", diff --git a/scripts/irods/upgrade_configuration.py b/scripts/irods/upgrade_configuration.py index 76268b16c1..1959d90729 100644 --- a/scripts/irods/upgrade_configuration.py +++ b/scripts/irods/upgrade_configuration.py @@ -316,6 +316,13 @@ def run_schema_update(config_dict, schema_name, next_schema_version): merge_hosts_config_into_server_config(config_dict) merge_host_access_control_config_into_server_config(config_dict) + if next_schema_version == 5: + if schema_name == 'server_config': + # Build a new server_config.json file using server_config.json.template as a base. + # Overwrite all configuration properties in the template with the properties from + # "config_dict" (i.e. the local server's server_config.json). + config_dict = convert_to_v4_schema_and_add_missing_properties(config_dict) + config_dict['schema_version'] = 'v%d' % (next_schema_version) return config_dict