Skip to content

Commit 86b1e8e

Browse files
committed
Always enable http server
1 parent 2deaf3b commit 86b1e8e

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

src/server/main.cpp

+7-11
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ int main(int argc, char **argv)
3232
.setArgument()
3333
.setHelp("listen on this port (default: 6080)")
3434
.setDefaultValue("6080");
35-
parser.addOption("http")
36-
.setHelp("enable http server");
3735
parser.addOption("http-address")
3836
.setArgument()
3937
.setHelp("http server listens on this address (default: 127.0.0.1)")
@@ -57,7 +55,6 @@ int main(int argc, char **argv)
5755
QString address = opts->option("address");
5856
int port = opts->option("port").toInt();
5957

60-
bool httpEnabled = opts->contains("http");
6158
QString httpAddress = opts->option("http-address");
6259
int httpPort = opts->option("http-port").toInt();
6360

@@ -77,15 +74,14 @@ int main(int argc, char **argv)
7774
listener.listen(QHostAddress(address), port);
7875
qDebug() << "Simple server listening on" << address << "port" << port;
7976

77+
HttpRequestHandler handler(listener.index(), metrics);
78+
8079
QHttpServer httpListener(&app);
81-
if (httpEnabled) {
82-
HttpRequestHandler handler(listener.index(), metrics);
83-
httpListener.listen(QHostAddress(httpAddress), httpPort, [&](QHttpRequest *req, QHttpResponse *res) {
84-
handler.router().handle(req, res);
85-
});
86-
qDebug() << "HTTP server listening on" << httpAddress << "port" << httpPort;
87-
qDebug() << "Prometheus metrics available at" << QString("http://%1:%2/_metrics").arg(httpAddress).arg(httpPort);
88-
}
80+
httpListener.listen(QHostAddress(httpAddress), httpPort, [&](QHttpRequest *req, QHttpResponse *res) {
81+
handler.router().handle(req, res);
82+
});
83+
qDebug() << "HTTP server listening on" << httpAddress << "port" << httpPort;
84+
qDebug() << "Prometheus metrics available at" << QString("http://%1:%2/_metrics").arg(httpAddress).arg(httpPort);
8985

9086
return app.exec();
9187
}

0 commit comments

Comments
 (0)