[COMMIT seastar master] httpd: don't use app_template::run_deprecated()

2 views
Skip to first unread message

Commit Bot

<bot@cloudius-systems.com>
unread,
May 15, 2023, 8:29:55 AM5/15/23
to seastar-dev@googlegroups.com, Avi Kivity
From: Avi Kivity <a...@scylladb.com>
Committer: Avi Kivity <a...@scylladb.com>
Branch: master

httpd: don't use app_template::run_deprecated()

It's deprecated. Use app_template::run() instead.

Not sure how it worked - app_template::run_deprecated accepts
a function returning void, so the future that httpd's main
returns is ignored.

---
diff --git a/apps/httpd/main.cc b/apps/httpd/main.cc
--- a/apps/httpd/main.cc
+++ b/apps/httpd/main.cc
@@ -80,7 +80,7 @@ int main(int ac, char** av) {
app.add_options()("prometheus_address", bpo::value<sstring>()->default_value("0.0.0.0"), "Prometheus address");
app.add_options()("prometheus_prefix", bpo::value<sstring>()->default_value("seastar_httpd"), "Prometheus metrics prefix");

- return app.run_deprecated(ac, av, [&] {
+ return app.run(ac, av, [&] {
return seastar::async([&] {
seastar_apps_lib::stop_signal stop_signal;
auto&& config = app.configuration();
@@ -129,6 +129,7 @@ int main(int ac, char** av) {
});

stop_signal.wait().get();
+ return 0;
});
});
}
Reply all
Reply to author
Forward
0 new messages