improve: fix warnings

Author: haohaolee

rest/CMakeLists.txt

@@ -4,7 +4,7 @@ add_library(rest)
 target_sources(rest PRIVATE server.cpp)
 target_include_directories(rest INTERFACE ..)
 
-target_compile_definitions(rest PRIVATE BOOST_ALL_NO_LIB)
+target_compile_definitions(rest PRIVATE BOOST_ALL_NO_LIB BOOST_ASIO_NO_DEPRECATED)
 
 if(WIN32)
   target_compile_definitions(rest PRIVATE _WIN32_WINNT=0x0601)

rest/session.h

@@ -7,9 +7,12 @@
 #include <boost/asio/dispatch.hpp>
 #include <boost/beast/core/flat_buffer.hpp>
 #include <boost/beast/core/tcp_stream.hpp>
+#include <boost/beast/http.hpp>
 
 #include "logger.h"
 
+namespace http = boost::beast::http;
+
 class session : public std::enable_shared_from_this<session> {
   using error_code = boost::beast::error_code;
   using tcp = boost::asio::ip::tcp;
@@ -32,7 +35,8 @@ class session : public std::enable_shared_from_this<session> {
     // otherwise the operation behavior is undefined.
     req_ = {};
     stream_.expires_after(std::chrono::seconds(30));
-    http::async_read(stream_, buffer_, req_, boost::beast::bind_front_handler(&session::on_read, shared_from_this()));
+    http::async_read(stream_, buffer_, req_,
+                     boost::beast::bind_front_handler(&session::on_read, shared_from_this()));
   }
 
   void on_read(error_code ec, std::size_t bytes_transferred) {
@@ -68,13 +72,18 @@ class session : public std::enable_shared_from_this<session> {
   void do_close() {
     error_code ec;
     stream_.socket().shutdown(tcp::socket::shutdown_send, ec);
+
+    if (ec && ec != boost::asio::error::not_connected) {
+      fail(ec, "shutdown");
+    }
   }
 
   template <class Body, class Fields>
   void send(http::response<Body, Fields> &&msg) {
     auto sp = std::make_shared<typename std::remove_reference<decltype(msg)>::type>(std::move(msg));
     res_ = sp;
-    http::async_write(stream_, *sp, boost::beast::bind_front_handler(&session::on_write, shared_from_this(), sp->need_eof()));
+    http::async_write(stream_, *sp,
+                      boost::beast::bind_front_handler(&session::on_write, shared_from_this(), sp->need_eof()));
   }
 
   boost::beast::tcp_stream stream_;

test/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_definitions(-DBOOST_ALL_NO_LIB)
+add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_ASIO_NO_DEPRECATED)
 
 if(WIN32)
   add_definitions(-D_WIN32_WINNT=0x0601)