Revert "Fix /stop command issued when hhvm can't bind port"

This reverts D944849 Reviewed By: @bertmaher Differential Revision: D1047984
atluriajith · Nov 8, 2013 · 0641b1d · 0641b1d
1 parent 6b1aaf3
commit 0641b1d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 51 deletions.
diff --git a/hphp/runtime/server/fastcgi/fastcgi-server.h b/hphp/runtime/server/fastcgi/fastcgi-server.h
@@ -132,8 +132,6 @@ class FastCGIServer : public Server,
   }
   virtual void start() override;
   virtual void waitForEnd() override;
-  virtual void waitForJobs() override { always_assert(false); }
-  virtual void closePort() override { always_assert(false); }
   virtual void stop() override;
   virtual int getActiveWorker() override {
     return m_dispatcher.getActiveWorker();

diff --git a/hphp/runtime/server/http-server.cpp b/hphp/runtime/server/http-server.cpp
@@ -284,15 +284,14 @@ void HttpServer::run() {
     if (m_stopReason) {
       Logger::Warning("Server stopping with reason: %s\n", m_stopReason);
     }
+    removePid();
     Logger::Info("page server stopped");
   }
 
   onServerShutdown(); // dangling server already started here
   time_t t0 = time(0);
   if (RuntimeOption::ServerPort) {
-    m_pageServer->waitForJobs();
-    removePid();
-    m_pageServer->closePort();
+    m_pageServer->stop();
   }
   time_t t1 = time(0);
   if (!m_danglings.empty() && RuntimeOption::ServerDanglingWait > 0) {
@@ -472,31 +471,14 @@ bool HttpServer::startServer(bool pageServer) {
 
       HttpClient http;
       string url = "http://";
-      if (!RuntimeOption::ServerIP.empty()) {
-        url += RuntimeOption::ServerIP;
-      } else {
-        url += "localhost";
-      }
+      url += RuntimeOption::ServerIP;
       url += ":";
       url += lexical_cast<string>(RuntimeOption::AdminServerPort);
       url += "/stop";
-      if (!RuntimeOption::AdminPasswords.empty()) {
-        for (auto it = RuntimeOption::AdminPasswords.begin();
-             it != RuntimeOption::AdminPasswords.end();
-             ++it) {
-          string passUrl = url + "?auth=" + *it;
-          StringBuffer response;
-          http.get(passUrl.c_str(), response);
-          sleep(1);
-        }
-      } else {
-        if (!RuntimeOption::AdminPassword.empty()) {
-          url += "?auth=" + RuntimeOption::AdminPassword;
-        }
-        StringBuffer response;
-        http.get(url.c_str(), response);
-        sleep(1);
-      }
+      StringBuffer response;
+      http.get(url.c_str(), response);
+
+      sleep(1);
     }
   }
 

diff --git a/hphp/runtime/server/libevent-server.cpp b/hphp/runtime/server/libevent-server.cpp
@@ -249,10 +249,8 @@ int LibEventServer::getLibEventConnectionCount() {
 void LibEventServer::start() {
   if (getStatus() == RunStatus::RUNNING) return;
 
-  if (m_server != nullptr) {
-    if (getAcceptSocket() != 0) {
-      throw FailedToListenException(m_address, m_port);
-    }
+  if (getAcceptSocket() != 0) {
+    throw FailedToListenException(m_address, m_port);
   }
 
   if (m_server_ssl != nullptr) {
@@ -316,7 +314,7 @@ void LibEventServer::dispatch() {
   }
 }
 
-void LibEventServer::waitForJobs() {
+void LibEventServer::stop() {
   Lock lock(m_mutex);
   if (getStatus() != RunStatus::RUNNING || m_server == nullptr) return;
 
@@ -365,18 +363,11 @@ void LibEventServer::waitForJobs() {
     // an error occured but we're in shutdown already, so ignore
   }
   m_dispatcherThread.waitForEnd();
-}
 
-void LibEventServer::closePort() {
   evhttp_free(m_server);
   m_server = nullptr;
 }
 
-void LibEventServer::stop() {
-  waitForJobs();
-  closePort();
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // SSL handling
 

diff --git a/hphp/runtime/server/libevent-server.h b/hphp/runtime/server/libevent-server.h
@@ -110,8 +110,6 @@ class LibEventServer : public Server, public TakeoverAgent::Callback {
   // implementing Server
   virtual void start();
   virtual void waitForEnd();
-  virtual void waitForJobs();
-  virtual void closePort();
   virtual void stop();
   virtual int getActiveWorker() {
     return m_dispatcher.getActiveWorker();

diff --git a/hphp/runtime/server/server.h b/hphp/runtime/server/server.h
@@ -195,16 +195,6 @@ class Server {
    */
   virtual void waitForEnd() = 0;
 
-  /*
-   * Stop accepting new connections and finish ongoing requests.
-   */
-  virtual void waitForJobs() = 0;
-
-  /*
-   * Close the port this server is listening on.
-   */
-  virtual void closePort() = 0;
-
   /**
    * Gracefully stop this web server. We will stop accepting new connections
    * and finish ongoing requests without being interrupted in the middle of