From b51c4bb49a99eb54538c8c8286df817054aa27b6 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Wed, 6 Mar 2019 05:40:49 -0800 Subject: [PATCH] Tidy up examples --- CHANGELOG.md | 1 + .../server-flex/advanced_server_flex.cpp | 7 +------ example/advanced/server/advanced_server.cpp | 3 +-- .../server/async-ssl/http_server_async_ssl.cpp | 3 +-- example/http/server/async/http_server_async.cpp | 3 +-- example/http/server/flex/http_server_flex.cpp | 3 +-- .../stackless-ssl/http_server_stackless_ssl.cpp | 16 ++++++++++------ .../server/stackless/http_server_stackless.cpp | 16 ++++++++++------ .../async-ssl/websocket_server_async_ssl.cpp | 3 +-- .../server/async/websocket_server_async.cpp | 3 +-- .../server/fast/websocket_server_fast.cpp | 3 +-- .../websocket_server_stackless_ssl.cpp | 16 ++++++++++------ .../stackless/websocket_server_stackless.cpp | 16 ++++++++++------ 13 files changed, 49 insertions(+), 44 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e20342cf..ba330a89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ Version 229: * Rename to buffer_bytes +* Tidy up examples -------------------------------------------------------------------------------- diff --git a/example/advanced/server-flex/advanced_server_flex.cpp b/example/advanced/server-flex/advanced_server_flex.cpp index 827cf9b2..5bbf64d9 100644 --- a/example/advanced/server-flex/advanced_server_flex.cpp +++ b/example/advanced/server-flex/advanced_server_flex.cpp @@ -785,10 +785,6 @@ private: void on_shutdown(beast::error_code ec) { - // Happens when the shutdown times out - if(ec == net::error::operation_aborted) - return; - if(ec) return fail(ec, "shutdown"); @@ -917,11 +913,10 @@ public: void run() { - if(! acceptor_.is_open()) - return; do_accept(); } +private: void do_accept() { diff --git a/example/advanced/server/advanced_server.cpp b/example/advanced/server/advanced_server.cpp index c2733bc6..13be92ef 100644 --- a/example/advanced/server/advanced_server.cpp +++ b/example/advanced/server/advanced_server.cpp @@ -588,11 +588,10 @@ public: void run() { - if(! acceptor_.is_open()) - return; do_accept(); } +private: void do_accept() { diff --git a/example/http/server/async-ssl/http_server_async_ssl.cpp b/example/http/server/async-ssl/http_server_async_ssl.cpp index 14a1b06b..3fae107d 100644 --- a/example/http/server/async-ssl/http_server_async_ssl.cpp +++ b/example/http/server/async-ssl/http_server_async_ssl.cpp @@ -463,11 +463,10 @@ public: void run() { - if(! acceptor_.is_open()) - return; do_accept(); } +private: void do_accept() { diff --git a/example/http/server/async/http_server_async.cpp b/example/http/server/async/http_server_async.cpp index 511eed98..95493aa0 100644 --- a/example/http/server/async/http_server_async.cpp +++ b/example/http/server/async/http_server_async.cpp @@ -405,11 +405,10 @@ public: void run() { - if(! acceptor_.is_open()) - return; do_accept(); } +private: void do_accept() { diff --git a/example/http/server/flex/http_server_flex.cpp b/example/http/server/flex/http_server_flex.cpp index 8ddb4d00..560be4dd 100644 --- a/example/http/server/flex/http_server_flex.cpp +++ b/example/http/server/flex/http_server_flex.cpp @@ -613,11 +613,10 @@ public: void run() { - if(! acceptor_.is_open()) - return; do_accept(); } +private: void do_accept() { diff --git a/example/http/server/stackless-ssl/http_server_stackless_ssl.cpp b/example/http/server/stackless-ssl/http_server_stackless_ssl.cpp index 85b9a0c4..6fb0db80 100644 --- a/example/http/server/stackless-ssl/http_server_stackless_ssl.cpp +++ b/example/http/server/stackless-ssl/http_server_stackless_ssl.cpp @@ -307,7 +307,8 @@ public: loop({}, 0, false); } -#include + #include + void loop( beast::error_code ec, @@ -389,7 +390,8 @@ public: // At this point the connection is closed gracefully } } -#include + + #include }; //------------------------------------------------------------------------------ @@ -457,12 +459,13 @@ public: void run() { - if(! acceptor_.is_open()) - return; loop(); } -#include +private: + + #include + void loop(beast::error_code ec = {}) { @@ -494,7 +497,8 @@ public: } } } -#include + + #include }; //------------------------------------------------------------------------------ diff --git a/example/http/server/stackless/http_server_stackless.cpp b/example/http/server/stackless/http_server_stackless.cpp index 934231ca..059ff934 100644 --- a/example/http/server/stackless/http_server_stackless.cpp +++ b/example/http/server/stackless/http_server_stackless.cpp @@ -281,7 +281,8 @@ public: loop(false, {}, 0); } -#include + #include + void loop( bool close, @@ -335,7 +336,8 @@ public: // At this point the connection is closed gracefully } } -#include + + #include }; //------------------------------------------------------------------------------ @@ -399,12 +401,13 @@ public: void run() { - if(! acceptor_.is_open()) - return; loop(); } -#include +private: + + #include + void loop(beast::error_code ec = {}) { @@ -434,7 +437,8 @@ public: } } } -#include + + #include }; //------------------------------------------------------------------------------ diff --git a/example/websocket/server/async-ssl/websocket_server_async_ssl.cpp b/example/websocket/server/async-ssl/websocket_server_async_ssl.cpp index 6d03e1af..d7ecd4a1 100644 --- a/example/websocket/server/async-ssl/websocket_server_async_ssl.cpp +++ b/example/websocket/server/async-ssl/websocket_server_async_ssl.cpp @@ -225,11 +225,10 @@ public: void run() { - if(! acceptor_.is_open()) - return; do_accept(); } +private: void do_accept() { diff --git a/example/websocket/server/async/websocket_server_async.cpp b/example/websocket/server/async/websocket_server_async.cpp index fb4825b4..ff82e6c7 100644 --- a/example/websocket/server/async/websocket_server_async.cpp +++ b/example/websocket/server/async/websocket_server_async.cpp @@ -196,11 +196,10 @@ public: void run() { - if(! acceptor_.is_open()) - return; do_accept(); } +private: void do_accept() { diff --git a/example/websocket/server/fast/websocket_server_fast.cpp b/example/websocket/server/fast/websocket_server_fast.cpp index 146fabd3..77bcdfe2 100644 --- a/example/websocket/server/fast/websocket_server_fast.cpp +++ b/example/websocket/server/fast/websocket_server_fast.cpp @@ -291,11 +291,10 @@ public: void run() { - if(! acceptor_.is_open()) - return; do_accept(); } +private: void do_accept() { diff --git a/example/websocket/server/stackless-ssl/websocket_server_stackless_ssl.cpp b/example/websocket/server/stackless-ssl/websocket_server_stackless_ssl.cpp index d0b285f0..a390f99c 100644 --- a/example/websocket/server/stackless-ssl/websocket_server_stackless_ssl.cpp +++ b/example/websocket/server/stackless-ssl/websocket_server_stackless_ssl.cpp @@ -68,7 +68,8 @@ public: loop({}, 0); } -#include + #include + void loop( beast::error_code ec, @@ -155,7 +156,8 @@ public: } } } -#include + + #include }; //------------------------------------------------------------------------------ @@ -220,12 +222,13 @@ public: void run() { - if(! acceptor_.is_open()) - return; loop(); } -#include +private: + + #include + void loop(beast::error_code ec = {}) { @@ -254,7 +257,8 @@ public: } } } -#include + + #include }; //------------------------------------------------------------------------------ diff --git a/example/websocket/server/stackless/websocket_server_stackless.cpp b/example/websocket/server/stackless/websocket_server_stackless.cpp index d03a181c..c0677d15 100644 --- a/example/websocket/server/stackless/websocket_server_stackless.cpp +++ b/example/websocket/server/stackless/websocket_server_stackless.cpp @@ -64,7 +64,8 @@ public: loop({}, 0); } -#include + #include + void loop( beast::error_code ec, @@ -132,7 +133,8 @@ public: } } } -#include + + #include }; //------------------------------------------------------------------------------ @@ -194,12 +196,13 @@ public: void run() { - if(! acceptor_.is_open()) - return; loop(); } -#include +private: + + #include + void loop(beast::error_code ec = {}) { @@ -228,7 +231,8 @@ public: } } } -#include + + #include }; //------------------------------------------------------------------------------