This commit is contained in:
Scott E. Graves 2024-12-20 13:47:17 -06:00
parent c8f4af7455
commit edb57903bc

View File

@ -773,7 +773,8 @@ auto app_config::get_json() const -> json {
{JSON_VERSION, version_}, {JSON_VERSION, version_},
}; };
if (prov_ == provider_type::encrypt) { switch (prov_) {
case provider_type::encrypt: {
ret.erase(JSON_BACKGROUND_DOWNLOAD_TIMEOUT_SECS); ret.erase(JSON_BACKGROUND_DOWNLOAD_TIMEOUT_SECS);
ret.erase(JSON_ENABLE_CHUNK_DOWNLOADER_TIMEOUT); ret.erase(JSON_ENABLE_CHUNK_DOWNLOADER_TIMEOUT);
ret.erase(JSON_EVICTION_DELAY_MINS); ret.erase(JSON_EVICTION_DELAY_MINS);
@ -789,16 +790,8 @@ auto app_config::get_json() const -> json {
ret.erase(JSON_RING_BUFFER_FILE_SIZE); ret.erase(JSON_RING_BUFFER_FILE_SIZE);
ret.erase(JSON_S3_CONFIG); ret.erase(JSON_S3_CONFIG);
ret.erase(JSON_SIA_CONFIG); ret.erase(JSON_SIA_CONFIG);
} else if (prov_ == provider_type::s3) { } break;
ret.erase(JSON_ENCRYPT_CONFIG); case provider_type::remote: {
ret.erase(JSON_HOST_CONFIG);
ret.erase(JSON_REMOTE_CONFIG);
ret.erase(JSON_SIA_CONFIG);
} else if (prov_ == provider_type::sia) {
ret.erase(JSON_ENCRYPT_CONFIG);
ret.erase(JSON_REMOTE_CONFIG);
ret.erase(JSON_S3_CONFIG);
} else if (prov_ == provider_type::remote) {
ret.erase(JSON_BACKGROUND_DOWNLOAD_TIMEOUT_SECS); ret.erase(JSON_BACKGROUND_DOWNLOAD_TIMEOUT_SECS);
ret.erase(JSON_DATABASE_TYPE); ret.erase(JSON_DATABASE_TYPE);
ret.erase(JSON_ENABLE_CHUNK_DOWNLOADER_TIMEOUT); ret.erase(JSON_ENABLE_CHUNK_DOWNLOADER_TIMEOUT);
@ -819,6 +812,18 @@ auto app_config::get_json() const -> json {
ret.erase(JSON_RING_BUFFER_FILE_SIZE); ret.erase(JSON_RING_BUFFER_FILE_SIZE);
ret.erase(JSON_S3_CONFIG); ret.erase(JSON_S3_CONFIG);
ret.erase(JSON_SIA_CONFIG); ret.erase(JSON_SIA_CONFIG);
} break;
case provider_type::s3: {
ret.erase(JSON_ENCRYPT_CONFIG);
ret.erase(JSON_HOST_CONFIG);
ret.erase(JSON_REMOTE_CONFIG);
ret.erase(JSON_SIA_CONFIG);
} break;
case provider_type::sia: {
ret.erase(JSON_ENCRYPT_CONFIG);
ret.erase(JSON_REMOTE_CONFIG);
ret.erase(JSON_S3_CONFIG);
} break;
} }
return ret; return ret;