From 8f862fd30273735c1956ff307eb00f17b6505ebd Mon Sep 17 00:00:00 2001 From: Arran Cudbard-Bell Date: Fri, 24 Sep 2021 15:39:55 -0500 Subject: [PATCH] Fix request timeout in rlm_sql_cassandra --- .../rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c index 170d24ff59..686909270e 100644 --- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c +++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c @@ -759,7 +759,10 @@ do {\ DO_CASS_OPTION("sql_server", cass_cluster_set_contact_points(cluster, config->sql_server)); if (config->sql_port) DO_CASS_OPTION("sql_port", cass_cluster_set_port(cluster, config->sql_port)); /* Can't fail */ - if (config->query_timeout) cass_cluster_set_request_timeout(cluster, fr_time_delta_to_msec(config->query_timeout)); + if (fr_time_delta_ispos(config->query_timeout)) { + cass_cluster_set_request_timeout(cluster, fr_time_delta_to_msec(config->query_timeout)); + } + /* Can't fail */ if (config->sql_login && config->sql_password) cass_cluster_set_credentials(cluster, config->sql_login, config->sql_password); -- 2.47.2