Commit ba1fdde0 authored by AdamSimpson's avatar AdamSimpson
Browse files

Make multiple attempts to reconnect, otherwise if the server isn't yet... 

Make multiple attempts to reconnect, otherwise if the server isn't yet available the client will fail
parent d26da6d4

Builder/main_heartbeat.cpp

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ int main(int argc, char *argv[]) { 


                        // Send the container to the client

                        // TODO we send the file in a blocking manner so the heartbeat doesn't process - fix file transfer

                        // TODO to handle heartbeat/resume

                        // TODO git puto handle heartbeat/resume

                        if (build_code == 0) {

                            logger::write(*socket, "Build complete, sending container");

                            messenger->send_file("container.img");

Client/main_heartbeat.cpp

+7 −2
Original line number Diff line number Diff line
@@ -47,7 +47,10 @@ int main(int argc, char *argv[]) { 


        tcp::socket queue_socket(io_service);

        tcp::resolver queue_resolver(io_service);

        boost::system::error_code ec;

        do {

            asio::connect(queue_socket, queue_resolver.resolve({queue_host(), queue_port()}));

        } while (ec != boost::system::errc::success);



        std::cout << "Connected to BuilderQueue: " << queue_host() << ":" << queue_port() << std::endl;
@@ -87,7 +90,9 @@ int main(int argc, char *argv[]) { 
            // Try to resolve a new connection to the builder and reset the socket and messenger

            builder_socket = std::make_shared<tcp::socket>(io_service);

            tcp::resolver builder_resolver(io_service);

            do {

                asio::connect(*builder_socket, builder_resolver.resolve({builder.host, builder.port}));

            } while (ec != boost::system::errc::success);

            builder_messenger = std::make_shared<Messenger>(*builder_socket);

        };