rgw: rgw_admin use raii for curl init/teardown

Since a lot of rgw-admin commands can exit early

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 4667937e4cece63751d5406d75c140418910a823)

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 7ae2e1e8244712cd7d6005152f19dfa92c827940..3f32320549b4aa760ced8372464cf89283f11540 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -2745,7 +2745,15 @@ int main(int argc, 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);
 
@@ -6404,6 +6412,5 @@ next:
     }
   }
 
-  rgw::curl::cleanup_curl();
   return 0;
 }