Tidy up examples

CHANGELOG.md

@@ -1,6 +1,7 @@
 Version 229:
 
 * Rename to buffer_bytes
+* Tidy up examples
 
 --------------------------------------------------------------------------------
 

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()
     {

example/advanced/server/advanced_server.cpp

@@ -588,11 +588,10 @@ public:
     void
     run()
     {
-        if(! acceptor_.is_open())
-            return;
         do_accept();
     }
 
+private:
     void
     do_accept()
     {

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()
     {

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()
     {

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()
     {

example/http/server/stackless-ssl/http_server_stackless_ssl.cpp

@@ -307,7 +307,8 @@ public:
         loop({}, 0, false);
     }
 
-#include <boost/asio/yield.hpp>
+    #include <boost/asio/yield.hpp>
+    
     void
     loop(
         beast::error_code ec,
@@ -389,7 +390,8 @@ public:
             // At this point the connection is closed gracefully
         }
     }
-#include <boost/asio/unyield.hpp>
+
+    #include <boost/asio/unyield.hpp>
 };
 
 //------------------------------------------------------------------------------
@@ -457,12 +459,13 @@ public:
     void
     run()
     {
-        if(! acceptor_.is_open())
-            return;
         loop();
     }
 
-#include <boost/asio/yield.hpp>
+private:
+
+    #include <boost/asio/yield.hpp>
+    
     void
     loop(beast::error_code ec = {})
     {
@@ -494,7 +497,8 @@ public:
             }
         }
     }
-#include <boost/asio/unyield.hpp>
+
+    #include <boost/asio/unyield.hpp>
 };
 
 //------------------------------------------------------------------------------

example/http/server/stackless/http_server_stackless.cpp

@@ -281,7 +281,8 @@ public:
         loop(false, {}, 0);
     }
 
-#include <boost/asio/yield.hpp>
+    #include <boost/asio/yield.hpp>
+
     void
     loop(
         bool close,
@@ -335,7 +336,8 @@ public:
             // At this point the connection is closed gracefully
         }
     }
-#include <boost/asio/unyield.hpp>
+
+    #include <boost/asio/unyield.hpp>
 };
 
 //------------------------------------------------------------------------------
@@ -399,12 +401,13 @@ public:
     void
     run()
     {
-        if(! acceptor_.is_open())
-            return;
         loop();
     }
 
-#include <boost/asio/yield.hpp>
+private:
+
+    #include <boost/asio/yield.hpp>
+    
     void
     loop(beast::error_code ec = {})
     {
@@ -434,7 +437,8 @@ public:
             }
         }
     }
-#include <boost/asio/unyield.hpp>
+
+    #include <boost/asio/unyield.hpp>
 };
 
 //------------------------------------------------------------------------------

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()
     {

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()
     {

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()
     {

example/websocket/server/stackless-ssl/websocket_server_stackless_ssl.cpp

@@ -68,7 +68,8 @@ public:
         loop({}, 0);
     }
 
-#include <boost/asio/yield.hpp>
+    #include <boost/asio/yield.hpp>
+    
     void
     loop(
         beast::error_code ec,
@@ -155,7 +156,8 @@ public:
             }
         }
     }
-#include <boost/asio/unyield.hpp>
+
+    #include <boost/asio/unyield.hpp>
 };
 
 //------------------------------------------------------------------------------
@@ -220,12 +222,13 @@ public:
     void
     run()
     {
-        if(! acceptor_.is_open())
-            return;
         loop();
     }
 
-#include <boost/asio/yield.hpp>
+private:
+
+    #include <boost/asio/yield.hpp>
+    
     void
     loop(beast::error_code ec = {})
     {
@@ -254,7 +257,8 @@ public:
             }
         }
     }
-#include <boost/asio/unyield.hpp>
+
+    #include <boost/asio/unyield.hpp>
 };
 
 //------------------------------------------------------------------------------

example/websocket/server/stackless/websocket_server_stackless.cpp

@@ -64,7 +64,8 @@ public:
         loop({}, 0);
     }
 
-#include <boost/asio/yield.hpp>
+    #include <boost/asio/yield.hpp>
+    
     void
     loop(
         beast::error_code ec,
@@ -132,7 +133,8 @@ public:
             }
         }
     }
-#include <boost/asio/unyield.hpp>
+
+    #include <boost/asio/unyield.hpp>
 };
 
 //------------------------------------------------------------------------------
@@ -194,12 +196,13 @@ public:
     void
     run()
     {
-        if(! acceptor_.is_open())
-            return;
         loop();
     }
 
-#include <boost/asio/yield.hpp>
+private:
+
+    #include <boost/asio/yield.hpp>
+    
     void
     loop(beast::error_code ec = {})
     {
@@ -228,7 +231,8 @@ public:
             }
         }
     }
-#include <boost/asio/unyield.hpp>
+
+    #include <boost/asio/unyield.hpp>
 };
 
 //------------------------------------------------------------------------------