Use the log crate.

src/bin/client.rs

@@ -2,9 +2,12 @@ use std::ffi::{OsStr, OsString};
 use std::fs::{self, create_dir_all, remove_file};
 use std::sync::Arc;
 
+use env_logger::Env;
 use fslock::LockFile;
+use log::{error, info};
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::{UnixListener, UnixStream};
+use tokio::signal;
 use tokio::stream::StreamExt;
 use tokio::sync::{mpsc, Mutex};
 
@@ -51,6 +54,8 @@ impl SynchronizedDirectory {
 
 #[tokio::main]
 async fn main() {
+    env_logger::from_env(Env::default().default_filter_or("info")).init();
+
     // Create the data directories if necessary.
     create_dir_all(paths::config_dir()).unwrap();
     create_dir_all(paths::client_data()).unwrap();
@@ -59,7 +64,7 @@ async fn main() {
     fs::write(&paths::client_lock(), b"").ok();
     let mut lock = LockFile::open(&paths::client_lock()).expect("cannot open lockfile");
     if !lock.try_lock().expect("error while locking the lock file") {
-        eprintln!("Client already running, exiting...");
+        error!("Client already running, exiting...");
         return;
     }
 
@@ -90,7 +95,7 @@ async fn main() {
         tokio::select! {
             result = &mut ctrl_c => {
                 result.expect("could not listen for Ctrl+C");
-                println!("Ctrl+C pressed, terminating...");
+                info!("Ctrl+C pressed, terminating...");
                 // Ctrl+C was pressed, so we terminate the program.
                 break;
             }
@@ -111,18 +116,18 @@ async fn main() {
                         };
                     }
                     Some(Err(err)) => {
-                        eprintln!("Error while listening on the local unix socket: {:?}", err);
+                        error!("Error while listening on the local unix socket: {:?}", err);
                         break;
                     }
                     None => {
-                        eprintln!("listening for CLI connections failed");
+                        error!("listening for CLI connections failed");
                         break;
                     }
                 }
             }
             error = errors.next() => {
                 let error = error.unwrap();
-                eprintln!("error: {:?}", error.error);
+                error!("Synchronization error: {:?}", error.error);
                 for directory in directories.iter_mut() {
                     if directory.path == error.directory {
                         // In theory, there could be a race condition here where we pause a
@@ -204,4 +209,3 @@ async fn handle_cli_client(
 
     Ok(())
 }
-

src/network/client.rs

@@ -7,6 +7,7 @@ use futures::future::{self, Either, Future};
 use futures::sink::{Sink, SinkExt};
 use futures::stream::{Stream, StreamExt};
 use futures::task::{Context, Poll};
+use log::error;
 use rmps::Serializer;
 use serde::de::DeserializeOwned;
 use serde::Serialize;
@@ -86,8 +87,7 @@ async fn client_connection_task<StreamType, ErrorType, PacketType>(
                                         free_ids.free(deserialized.id);
                                         call.send(Ok(deserialized.payload)).ok();
                                     } else {
-                                        // TODO: Use proper logging functionality.
-                                        eprintln!(
+                                        error!(
                                             "Received a reply for an unknown call ({:?})!",
                                             deserialized.id
                                         );
@@ -98,14 +98,12 @@ async fn client_connection_task<StreamType, ErrorType, PacketType>(
                                 // We received an invalid packet. We cannot determine for which
                                 // call the packet was, so we just ignore it. The corresponding
                                 // call will freeze until the connection is dropped.
-                                // TODO: Use proper logging functionality.
-                                eprintln!("Invalid packet received: {:?}", e);
+                                error!("Invalid packet received: {:?}", e);
                             }
                         };
                     }
                     Some(Err(e)) => {
-                        // TODO: Use proper logging functionality.
-                        eprintln!("Network error: {:?}", e);
+                        error!("Network error: {:?}", e);
                     }
                     None => {
                         // Stream closed. We still need to return errors for any