RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: don't use rgw_socket_path if frontend is configured

Browse Source 
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 <yehuda@redhat.com>
This commit is contained in:
Yehuda Sadeh 2015-03-18 20:49:13 -07:00
parent 68d3637fea
commit 36d6eea3ca
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/rgw/rgw_main.cc
View File

@ -282,10 +282,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;