Skip to content

Commit 1a4e70f

Browse files
author
Evan Zelkowitz
committed
Fix indent
Change to just do a clamp as well if firstLoad
1 parent 393ce59 commit 1a4e70f

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

src/iocore/net/SSLUtils.cc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,11 +1750,8 @@ SSLMultiCertConfigLoader::load(SSLCertLookup *lookup, bool firstLoad)
17501750
static constexpr int MAX_LOAD_THREADS = 256;
17511751

17521752
int num_threads = params->configLoadConcurrency;
1753-
if (num_threads == 0 || firstLoad) {
1754-
num_threads = std::min(static_cast<int>(std::thread::hardware_concurrency()), MAX_LOAD_THREADS);
1755-
}
1756-
if (num_threads < 1) {
1757-
num_threads = 1;
1753+
if (firstLoad) {
1754+
num_threads = std::clamp(static_cast<int>(std::thread::hardware_concurrency()), 1, MAX_LOAD_THREADS);
17581755
}
17591756
num_threads = std::min(num_threads, static_cast<int>(parse_result.value.size()));
17601757

src/records/RecordsConfig.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,9 +1180,9 @@ static constexpr RecordElement RecordsConfig[] =
11801180
{RECT_CONFIG, "proxy.config.ssl.server.multicert.filename", RECD_STRING, ts::filename::SSL_MULTICERT, RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
11811181
,
11821182
{RECT_CONFIG, "proxy.config.ssl.server.multicert.exit_on_load_fail", RECD_INT, "1", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
1183-
,
1183+
,
11841184
{RECT_CONFIG, "proxy.config.ssl.server.multicert.concurrency", RECD_INT, "1", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-256]", RECA_NULL}
1185-
,
1185+
,
11861186
{RECT_CONFIG, "proxy.config.ssl.servername.filename", RECD_STRING, ts::filename::SNI, RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
11871187
,
11881188
{RECT_CONFIG, "proxy.config.ssl.server.ticket_key.filename", RECD_STRING, nullptr, RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL}

0 commit comments

Comments
 (0)