Browse Source

Remove closed connections immediately

Previously it relied on a timer to drop dead connections but that proved to
be too slow when there is an incoming burst of connections.

Fixes #10487.
adaptive-webui-19844
Chocobo1 6 years ago
parent
commit
a35b6cc8dd
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 13
      src/base/http/server.cpp
  2. 1
      src/base/http/server.h

13
src/base/http/server.cpp

@ -108,15 +108,22 @@ void Server::incomingConnection(const qintptr socketDescriptor)
auto *c = new Connection(serverSocket, m_requestHandler, this); auto *c = new Connection(serverSocket, m_requestHandler, this);
m_connections.append(c); m_connections.append(c);
connect(serverSocket, &QAbstractSocket::disconnected, this, [c, this]() { removeConnection(c); });
}
void Server::removeConnection(Connection *connection)
{
m_connections.removeOne(connection);
connection->deleteLater();
} }
void Server::dropTimedOutConnection() void Server::dropTimedOutConnection()
{ {
QMutableListIterator<Connection *> i(m_connections); QMutableListIterator<Connection *> i(m_connections);
while (i.hasNext()) { while (i.hasNext()) {
const auto *connection = i.next(); Connection *connection = i.next();
if (connection->isClosed() || connection->hasExpired(KEEP_ALIVE_DURATION)) { if (connection->hasExpired(KEEP_ALIVE_DURATION)) {
delete connection; connection->deleteLater();
i.remove(); i.remove();
} }
} }

1
src/base/http/server.h

@ -56,6 +56,7 @@ namespace Http
private: private:
void incomingConnection(qintptr socketDescriptor); void incomingConnection(qintptr socketDescriptor);
void removeConnection(Connection *connection);
IRequestHandler *m_requestHandler; IRequestHandler *m_requestHandler;
QList<Connection *> m_connections; // for tracking persistent connections QList<Connection *> m_connections; // for tracking persistent connections

Loading…
Cancel
Save