io: Building examples

2 files changed, 21 insertions, 7 deletions

diff --git a/modules/io/examples/SConscript b/modules/io/examples/SConscript
index 850edcd..a8fad79 100644
--- a/modules/io/examples/SConscript
+++ b/modules/io/examples/SConscript
@@ -19,10 +19,14 @@ env.sources += examples_env.sources;
 env.headers += examples_env.headers;
 
 objects_static = []
-examples_env.echo_client = examples_env.Program('#bin/echo_client', ['echo_client.cpp', env.sources]);
-examples_env.echo_server = examples_env.Program('#bin/echo_server', ['echo_server.cpp', env.sources]);
+examples_env.echo_client = examples_env.Program('#bin/echo_client', ['echo_client.cpp', env.library_static]);
+examples_env.echo_server = examples_env.Program('#bin/echo_server', ['echo_server.cpp', env.library_static]);
 
 # Set Alias
-env.Alias('examples', [examples_env.echo_client, examples_env.echo_server]);
+env.examples = [examples_env.echo_client, examples_env.echo_server];
+env.Alias('examples', env.examples);
 
-env.targets += ['examples'];
+if env["build_examples"]:
+	env.targets += ['examples'];
+	env.Install('$prefix/bin/', env.examples);
+#endif
diff --git a/modules/io/examples/echo_server.cpp b/modules/io/examples/echo_server.cpp
index 82513ff..24bdfa2 100644
--- a/modules/io/examples/echo_server.cpp
+++ b/modules/io/examples/echo_server.cpp
@@ -52,10 +52,12 @@ int main(){
 
 	message msg_state;
 
+	std::cout<<"Starting to resolve address"<<std::endl;
 	/**
 	 * Try to resolve address. If resolved
 	 */
-	network.resolve_address("127.0.0.1", 4321).then([&](auto net_addr){
+	network.resolve_address("127.0.0.1", 4322).then([&](auto net_addr){
+		std::cout<<"Resolved address"<<std::endl;
 		addr = std::move(net_addr);
 		srv = network.listen(*addr);
 		if(srv){
@@ -74,11 +76,19 @@ int main(){
 		}else{
 			keep_running = false;
 		}
-	}).detach();
+	}).detach([&](auto err) {
+		std::cout<<"Failed to resolve address: "<<err.get_category()<<":"<<err.get_message()<<std::endl;
+		keep_running = false;
+		return err;
+	});
+
+	std::cout<<"Entering waiting loop"<<std::endl;
 
 	while(keep_running){
-		wait_scope.wait();
+		wait_scope.wait(std::chrono::seconds{1});
 	}
 
+	std::cout<<"\n\nShutting down echo server"<<std::endl;
+
 	return 0;
 }