Merge pull request #4275 from jeanchlopez/wip-11160-firefly

rgw: shouldn't need to disable rgw_socket_path if frontend is configured
ceph · Apr 6, 2015 · 12143ff · 12143ff
2 parents 53eff01 + bf1d8e8
commit 12143ff
Showing 1 changed file with 8 additions and 1 deletion.
diff --git 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;