don't sigabort if ssl port is unavailable

fredemmott · fredemmott · commit 43edcb457094 · 2018-02-06T08:26:42.000-08:00
Summary: - catch the right exception - change the log message so that includes the /actual/ bind address; without that, we always log the HTTP port, even if the HTTPS port is the one with the problem. refs #8061 Reviewed By: swtaarrs Differential Revision: D6851598
diff --git a/hphp/runtime/server/http-server.cpp b/hphp/runtime/server/http-server.cpp
@@ -834,12 +834,7 @@ bool HttpServer::startServer(bool pageServer) {
       StopOldServer();
 
       if (errno == EACCES) {
-        if (pageServer && !RuntimeOption::ServerFileSocket.empty()) {
-          Logger::Error("Permission denied opening socket at %s",
-                        RuntimeOption::ServerFileSocket.c_str());
-        } else {
-          Logger::Error("Permission denied listening on port %d", port);
-        }
+        Logger::Error("%s: Permission denied.", e.what());
         return false;
       }
 
diff --git a/hphp/runtime/server/proxygen/proxygen-server.cpp b/hphp/runtime/server/proxygen/proxygen-server.cpp
@@ -38,7 +38,6 @@
 
 namespace HPHP {
 
-using apache::thrift::transport::TTransportException;
 using folly::SocketAddress;
 using folly::AsyncServerSocket;
 using wangle::Acceptor;
@@ -282,7 +281,7 @@ void ProxygenServer::start() {
         m_httpsServerSocket->setReusePortEnabled(RuntimeOption::StopOldServer);
         m_httpsServerSocket->bind(m_httpsConfig.bindAddress);
       }
-    } catch (const TTransportException& ex) {
+    } catch (const std::system_error& ex) {
       failedToListen(ex, m_httpsConfig.bindAddress);
     }
 
