From 50cf34ac4bb2e05887626e7271302e9ee964e94f Mon Sep 17 00:00:00 2001 From: Abhishek Lekshmanan Date: Mon, 5 Mar 2018 17:59:33 +0100 Subject: [PATCH] rgw: rgw_admin use raii for curl init/teardown Since a lot of rgw-admin commands can exit early Signed-off-by: Abhishek Lekshmanan (cherry picked from commit 4667937e4cece63751d5406d75c140418910a823) --- src/rgw/rgw_admin.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 9ff804dcd915..92cd07d43efe 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -2953,7 +2953,15 @@ int main(int argc, const char **argv) rgw_user_init(store); rgw_bucket_init(store->meta_mgr); - rgw::curl::setup_curl(boost::none); + + struct rgw_curl_setup { + rgw_curl_setup() { + rgw::curl::setup_curl(boost::none); + } + ~rgw_curl_setup() { + rgw::curl::cleanup_curl(); + } + } curl_cleanup; StoreDestructor store_destructor(store); @@ -7111,6 +7119,5 @@ next: } } - rgw::curl::cleanup_curl(); return 0; } -- 2.47.3