From e1ab2e7dee1670540a99f3a1baa0f25e9f0b5a43 Mon Sep 17 00:00:00 2001
From: Nathan Nichols <natenichols@cox.net>
Date: Mon, 24 May 2021 13:32:14 -0500
Subject: [PATCH] close websocket on destructor

---
 reporting/server/session.h | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/reporting/server/session.h b/reporting/server/session.h
index b37d2afb7..1b03fc33f 100644
--- a/reporting/server/session.h
+++ b/reporting/server/session.h
@@ -107,6 +107,7 @@ boost::json::object
 doLedger(
     boost::json::object const& request,
     BackendInterface const& backend);
+
 boost::json::object
 doLedgerRange(
     boost::json::object const& request,
@@ -204,7 +205,10 @@ public:
         )->run();
     }
 
-    ~session() = default;
+    ~session()
+    {
+        close(1012);
+    }
 
     void
     send(std::string&& msg)
@@ -216,6 +220,15 @@ public:
                 &session::on_write, shared_from_this()));
     }
 
+    void
+    close(boost::beast::websocket::close_reason const& cr)
+    {
+        ws_.async_close(
+            cr,
+            boost::beast::bind_front_handler(
+                &session::on_close, shared_from_this()));
+    }
+
 private:
 
     // Get on the correct executor
@@ -329,7 +342,7 @@ private:
     }
 
     void
-    on_write(boost::beast::error_code ec, std::size_t bytes_transferred)
+    on_write(boost::beast::error_code const& ec, std::size_t bytes_transferred)
     {
         boost::ignore_unused(bytes_transferred);
 
@@ -342,6 +355,13 @@ private:
         // Do another read
         do_read();
     }
+
+    void
+    on_close(boost::beast::error_code const& ec)
+    {
+        if (ec)
+            return fail(ec, "close");
+    }
 };
 
 #endif // RIPPLE_REPORTING_SESSION_H
\ No newline at end of file