Revert D101266356

Summary: Fix unintended consequendes of previous change:

Reviewed By: kwaugh

Differential Revision: D101491570

fbshipit-source-id: 6111aba579e4dd1744945a199708fe69cabad30b

Author: generatedunixname89002005232357

wangle/acceptor/ManagedConnection.h

@@ -130,8 +130,9 @@ class ManagedConnection : public folly::HHWheelTimer::Callback,
    * Called when the connection age timeout fires. The default implementation
    * removes the connection from the ConnectionManager (if
    * detachOnConnectionAgeTimeout is set) and then calls closeWhenIdle().
+   * Subclasses can override to customize behavior.
    */
-  void onConnectionAgeTimeout();
+  virtual void onConnectionAgeTimeout();
 
   /**
    * Dump the state of the connection to the log

wangle/bootstrap/ServerBootstrap-inl.h

@@ -114,15 +114,17 @@ class ServerAcceptor : public Acceptor,
       }
     }
 
-    void closeWhenIdle() override {
-      dropConnection();
-    }
-
+    void closeWhenIdle() override {}
     void dropConnection(const std::string& /* errorMsg */ = "") override {
       auto ew = folly::make_exception_wrapper<AcceptorException>(
           AcceptorException::ExceptionType::DROPPED, "dropped");
       pipeline_->readException(ew);
     }
+    void onConnectionAgeTimeout() override {
+      // ServerConnection has no graceful drain (closeWhenIdle is a no-op),
+      // so drop the connection immediately.
+      dropConnection();
+    }
     void dumpConnectionState(uint8_t /* loglevel */) override {}
 
     void deletePipeline(wangle::PipelineBase* p) override {