diff options
Diffstat (limited to 'vespalib/src')
-rw-r--r-- | vespalib/src/vespa/vespalib/websocket/websocket_server.cpp | 16 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/websocket/websocket_server.h | 9 |
2 files changed, 15 insertions, 10 deletions
diff --git a/vespalib/src/vespa/vespalib/websocket/websocket_server.cpp b/vespalib/src/vespa/vespalib/websocket/websocket_server.cpp index 171b7dabc1d..d3ef13e78d7 100644 --- a/vespalib/src/vespa/vespalib/websocket/websocket_server.cpp +++ b/vespalib/src/vespa/vespalib/websocket/websocket_server.cpp @@ -7,8 +7,7 @@ #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/host_name.h> -namespace vespalib { -namespace ws { +namespace vespalib::ws { namespace { @@ -116,7 +115,13 @@ void handle_upgrade(Connection &conn, Request &req) { } // namespace vespalib::ws::<unnamed> -WebsocketServer::StaticPage::~StaticPage() {} +WebsocketServer::StaticPage::StaticPage(const vespalib::string & type, const vespalib::string & content_in) + : content_type(type), + content(content_in) +{} +WebsocketServer::StaticPage::StaticPage(const StaticPage &) = default; +WebsocketServer::StaticPage & WebsocketServer::StaticPage::operator = (const StaticPage &) = default; +WebsocketServer::StaticPage::~StaticPage() = default; WebsocketServer::WebsocketServer(int port_in, StaticRepo &&repo) : _acceptor(port_in, *this), @@ -125,7 +130,7 @@ WebsocketServer::WebsocketServer(int port_in, StaticRepo &&repo) { } -WebsocketServer::~WebsocketServer() {} +WebsocketServer::~WebsocketServer() = default; void WebsocketServer::handle(std::unique_ptr<Socket> socket) @@ -156,5 +161,4 @@ WebsocketServer::handle(std::unique_ptr<Socket> socket) } } -} // namespace vespalib::ws -} // namespace vespalib +} diff --git a/vespalib/src/vespa/vespalib/websocket/websocket_server.h b/vespalib/src/vespa/vespalib/websocket/websocket_server.h index 31f657ddc1b..03b3da72134 100644 --- a/vespalib/src/vespa/vespalib/websocket/websocket_server.h +++ b/vespalib/src/vespa/vespalib/websocket/websocket_server.h @@ -7,12 +7,14 @@ #include <vespa/vespalib/stllike/string.h> #include <map> -namespace vespalib { -namespace ws { +namespace vespalib::ws { class WebsocketServer : public Handler<Socket> { public: struct StaticPage { + StaticPage(const vespalib::string & type, const vespalib::string & content_in); + StaticPage(const StaticPage &); + StaticPage & operator = (const StaticPage &); StaticPage(StaticPage &&) = default; StaticPage & operator = (StaticPage &&) = default; ~StaticPage(); @@ -28,10 +30,9 @@ private: public: WebsocketServer(int port_in, StaticRepo &&repo = StaticRepo()); - ~WebsocketServer(); + ~WebsocketServer() override; void handle(std::unique_ptr<Socket> socket) override; int port() { return _acceptor.port(); } }; } // namespace vespalib::ws -} // namespace vespalib |