From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Mon, 5 Mar 2018 16:59:33 +0000 (+0100)
Subject: rgw: rgw_admin use raii for curl init/teardown
X-Git-Tag: v10.2.11~100^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b53166c660ce32e9ac67e23605db8e93c6e7c53e;p=ceph.git

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 7ae2e1e824471..3f32320549b4a 100644
--- 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;
 }