]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
librgw: initialize curl and http client for multisite 24402/head
authorCasey Bodley <cbodley@redhat.com>
Wed, 3 Oct 2018 15:38:07 +0000 (11:38 -0400)
committerCasey Bodley <cbodley@redhat.com>
Wed, 3 Oct 2018 15:41:33 +0000 (11:41 -0400)
Fixes: http://tracker.ceph.com/issues/36302
Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/rgw/librgw.cc

index faa0f5c23aefa5b1f1248c2d7a032f641ab1d2dc..0e6c6151c1c311519c2af5b745e1c0c0d9998d3a 100644 (file)
@@ -49,6 +49,8 @@
 #include "rgw_auth_s3.h"
 #include "rgw_lib.h"
 #include "rgw_lib_frontend.h"
+#include "rgw_http_client.h"
+#include "rgw_http_client_curl.h"
 
 #include <errno.h>
 #include <thread>
@@ -489,6 +491,8 @@ namespace rgw {
     rgw_tools_init(g_ceph_context);
 
     rgw_init_resolver();
+    rgw::curl::setup_curl(boost::none);
+    rgw_http_client_init(g_ceph_context);
 
     store = RGWStoreManager::get_storage(g_ceph_context,
                                         g_conf()->rgw_enable_gc_threads,
@@ -598,6 +602,8 @@ namespace rgw {
 
     rgw_tools_cleanup();
     rgw_shutdown_resolver();
+    rgw_http_client_cleanup();
+    rgw::curl::cleanup_curl();
 
     rgw_perf_stop(g_ceph_context);