Remove AsyncResp from openHandler
This change, moving the openHandler back to only supporting websocket
disconnects and not 404s.Because AsyncResp is removed from openHandler.
Tested:
(from previous commit) Opened KVM in webui-vue and it works.
Signed-off-by: zhanghaicheng <zhanghch05@inspur.com>
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I793f05836aeccdc275b7aaaeede41b3a2c276595
diff --git a/include/dbus_monitor.hpp b/include/dbus_monitor.hpp
index 8519b5a..764d157 100644
--- a/include/dbus_monitor.hpp
+++ b/include/dbus_monitor.hpp
@@ -109,8 +109,7 @@
BMCWEB_ROUTE(app, "/subscribe")
.privileges({{"Login"}})
.websocket()
- .onopen([&](crow::websocket::Connection& conn,
- const std::shared_ptr<bmcweb::AsyncResp>&) {
+ .onopen([&](crow::websocket::Connection& conn) {
BMCWEB_LOG_DEBUG << "Connection " << &conn << " opened";
sessions.try_emplace(&conn);
})
diff --git a/include/kvm_websocket.hpp b/include/kvm_websocket.hpp
index d45d414..fa61b75 100644
--- a/include/kvm_websocket.hpp
+++ b/include/kvm_websocket.hpp
@@ -161,8 +161,7 @@
BMCWEB_ROUTE(app, "/kvm/0")
.privileges({{"ConfigureComponents", "ConfigureManager"}})
.websocket()
- .onopen([](crow::websocket::Connection& conn,
- const std::shared_ptr<bmcweb::AsyncResp>&) {
+ .onopen([](crow::websocket::Connection& conn) {
BMCWEB_LOG_DEBUG << "Connection " << &conn << " opened";
if (sessions.size() == maxSessions)
diff --git a/include/nbd_proxy.hpp b/include/nbd_proxy.hpp
index e0a0111..9f46c03 100644
--- a/include/nbd_proxy.hpp
+++ b/include/nbd_proxy.hpp
@@ -255,8 +255,7 @@
{
BMCWEB_ROUTE(app, "/nbd/<str>")
.websocket()
- .onopen([](crow::websocket::Connection& conn,
- const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) {
+ .onopen([](crow::websocket::Connection& conn) {
BMCWEB_LOG_DEBUG << "nbd-proxy.onopen(" << &conn << ")";
auto getUserInfoHandler = [&conn, asyncResp](
diff --git a/include/obmc_console.hpp b/include/obmc_console.hpp
index 01ee479..fc99d41 100644
--- a/include/obmc_console.hpp
+++ b/include/obmc_console.hpp
@@ -118,8 +118,7 @@
BMCWEB_ROUTE(app, "/console0")
.privileges({{"ConfigureComponents", "ConfigureManager"}})
.websocket()
- .onopen([](crow::websocket::Connection& conn,
- const std::shared_ptr<bmcweb::AsyncResp>&) {
+ .onopen([](crow::websocket::Connection& conn) {
BMCWEB_LOG_DEBUG << "Connection " << &conn << " opened";
sessions.insert(&conn);
diff --git a/include/vm_websocket.hpp b/include/vm_websocket.hpp
index 5adf303..6c97f85 100644
--- a/include/vm_websocket.hpp
+++ b/include/vm_websocket.hpp
@@ -165,8 +165,7 @@
BMCWEB_ROUTE(app, "/vm/0/0")
.privileges({{"ConfigureComponents", "ConfigureManager"}})
.websocket()
- .onopen([](crow::websocket::Connection& conn,
- const std::shared_ptr<bmcweb::AsyncResp>&) {
+ .onopen([](crow::websocket::Connection& conn) {
BMCWEB_LOG_DEBUG << "Connection " << &conn << " opened";
if (session != nullptr)