From bf1d8e888439df75feadde76bafe7d07d0e8481a Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 18 Mar 2015 20:49:13 -0700 Subject: [PATCH] rgw: don't use rgw_socket_path if frontend is configured Fixes: #11160 Backport: hammer, firefly Previously if we wanted to use the tcp fcgi socket, we needed to clear rgw_socket_path. Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_main.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index fc40b6493ce3e..24094d4e29a67 100644 --- a/src/rgw/rgw_main.cc +++ b/src/rgw/rgw_main.cc @@ -261,10 +261,17 @@ void RGWFCGXProcess::run() string socket_port; string socket_host; - conf->get_val("socket_path", g_conf->rgw_socket_path, &socket_path); + conf->get_val("socket_path", "", &socket_path); conf->get_val("socket_port", g_conf->rgw_port, &socket_port); conf->get_val("socket_host", g_conf->rgw_host, &socket_host); + if (socket_path.empty() && socket_port.empty() && socket_host.empty()) { + socket_path = g_conf->rgw_socket_path; + if (socket_path.empty()) { + dout(0) << "ERROR: no socket server point defined, cannot start fcgi frontend" << dendl; + return; + } + } if (!socket_path.empty()) { string path_str = socket_path; -- 2.39.5