squash w/ startup/shutdown. Make delay server migration sleep time op…

…tional again.
korydraughn · Nov 9, 2024 · 4aa8237 · 4aa8237
1 parent ffe9ff5
commit 4aa8237
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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<int>(irods::KW_CFG_MIGRATE_DELAY_SERVER_SLEEP_TIME_IN_SECONDS);
+        const auto migration_sleep_time_in_seconds = irods::get_advanced_setting_or_default<int>(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}) {