Enable http server connetction

GolosChain · Mar 2, 2018 · 41b1f28 · 41b1f28
1 parent d9a8e98
commit 41b1f28
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 28 deletions.
diff --git a/plugins/network_broadcast_api/network_broadcast_api.cpp b/plugins/network_broadcast_api/network_broadcast_api.cpp
@@ -95,8 +95,8 @@ namespace golos {
                 const auto n_args = args.args->size();
                 FC_ASSERT(n_args >= 2, "Expected at least 1 argument, got 0");
                 auto trx = args.args->at(1).as<signed_transaction>();
-                if (n_args > 1) {
-                    const auto max_block_age = args.args->at(1).as<uint32_t>();
+                if (n_args > 2) {
+                    const auto max_block_age = args.args->at(2).as<uint32_t>();
                     FC_ASSERT(!check_max_block_age(max_block_age));
                 }
 

diff --git a/plugins/webserver/webserver_plugin.cpp b/plugins/webserver/webserver_plugin.cpp
@@ -139,32 +139,28 @@ namespace golos {
                 }
 
                 if (http_endpoint && ((ws_endpoint && ws_endpoint != http_endpoint) || !ws_endpoint)) {
-                    if (1) {
-                        ilog("http thread is disabled in this build!");
-                    } else {
-                        http_thread = std::make_shared<std::thread>([&]() {
-                            ilog("start processing http thread");
-                            try {
-                                http_server.clear_access_channels(websocketpp::log::alevel::all);
-                                http_server.clear_error_channels(websocketpp::log::elevel::all);
-                                http_server.init_asio(&http_ios);
-                                http_server.set_reuse_addr(true);
-
-                                http_server.set_http_handler(
-                                        boost::bind(&webserver_plugin_impl::handle_http_message, this, &http_server,
-                                                    _1));
-
-                                ilog("start listening for http requests");
-                                http_server.listen(*http_endpoint);
-                                http_server.start_accept();
-
-                                http_ios.run();
-                                ilog("http io service exit");
-                            } catch (...) {
-                                elog("error thrown from http io service");
-                            }
-                        });
-                    }
+                    http_thread = std::make_shared<std::thread>( [&]() {
+                        ilog("start processing http thread");
+                        try {
+                            http_server.clear_access_channels(websocketpp::log::alevel::all);
+                            http_server.clear_error_channels(websocketpp::log::elevel::all);
+                            http_server.init_asio(&http_ios);
+                            http_server.set_reuse_addr(true);
+
+                            http_server.set_http_handler([this](connection_hdl hdl) {
+                                this->handle_http_message(&this->http_server, hdl);
+                            });
+
+                            ilog("start listening for http requests");
+                            http_server.listen(*http_endpoint);
+                            http_server.start_accept();
+
+                            http_ios.run();
+                            ilog("http io service exit");
+                        } catch (...) {
+                            elog("error thrown from http io service");
+                        }
+                    });
                 }
             }