diff --git a/schemas/configuration/v5/server_config.json.in b/schemas/configuration/v5/server_config.json.in index c8db9edcfd..8bd366cf29 100644 --- a/schemas/configuration/v5/server_config.json.in +++ b/schemas/configuration/v5/server_config.json.in @@ -45,7 +45,6 @@ "default_temporary_password_lifetime_in_seconds", "maximum_size_for_single_buffer_in_megabytes", "maximum_temporary_password_lifetime_in_seconds", - "migrate_delay_server_sleep_time_in_seconds", "transfer_buffer_size_for_parallel_transfer_in_megabytes", "transfer_chunk_size_for_parallel_transfer_in_megabytes" ] diff --git a/server/main_server/src/main.cpp b/server/main_server/src/main.cpp index 274238596b..751ea2caf3 100644 --- a/server/main_server/src/main.cpp +++ b/server/main_server/src/main.cpp @@ -1112,8 +1112,7 @@ Mandatory arguments to long options are mandatory for short options too. } } - // TODO Update irods/irods_docs - made /advanced_settings/migrate_delay_server_sleep_time_in_seconds a required property. - const auto migration_sleep_time_in_seconds = irods::get_advanced_setting(irods::KW_CFG_MIGRATE_DELAY_SERVER_SLEEP_TIME_IN_SECONDS); + const auto migration_sleep_time_in_seconds = irods::get_advanced_setting_or_default(irods::KW_CFG_MIGRATE_DELAY_SERVER_SLEEP_TIME_IN_SECONDS, 5); const auto now = std::chrono::steady_clock::now(); if (now - _time_start < std::chrono::seconds{migration_sleep_time_in_seconds}) {