Simplified error messages

OpenMatchmaking · Jan 9, 2019 · 0f46266 · 0f46266
1 parent 7d25688
commit 0f46266
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/pathfinder/src/engine/futures.rs b/pathfinder/src/engine/futures.rs
@@ -170,7 +170,7 @@ pub fn rpc_request_future(
         .then(move |result| match result {
             Ok(_) => Ok(()),
             Err(err) => {
-                error!("Error in RabbitMQ client. Reason -> {}", err);
+                error!("Error in RabbitMQ client. Reason: {}", err);
                 let message = String::from("The request wasn't processed. Please, try once again.");
                 Err(PathfinderError::MessageBrokerError(message))
             }

diff --git a/pathfinder/src/engine/middleware/jwt.rs b/pathfinder/src/engine/middleware/jwt.rs
@@ -203,7 +203,7 @@ impl JwtTokenMiddleware {
                 }
             },
             Err(err) => {
-                error!("Error in RabbitMQ client. Reason -> {}", err);
+                error!("Error in RabbitMQ client. Reason: {}", err);
                 let message = String::from("The request wasn't processed. Please, try once again.");
                 Err(PathfinderError::MessageBrokerError(message))
             }
@@ -372,7 +372,7 @@ impl JwtTokenMiddleware {
                 }
             },
             Err(err) => {
-                error!("Error in RabbitMQ client. Reason -> {}", err);
+                error!("Error in RabbitMQ client. Reason: {}", err);
                 let message = String::from("The request wasn't processed. Please, try once again.");
                 Err(PathfinderError::MessageBrokerError(message))
             }

diff --git a/pathfinder/src/proxy.rs b/pathfinder/src/proxy.rs
@@ -147,10 +147,8 @@ impl Proxy {
         // Run the server
         let server_future = self
             .get_rabbitmq_client()
-            .map_err(|error| {
-                error!("Lapin error: {:?}", error);
-                ()
-            }).and_then(|rabbitmq: Arc<RabbitMQClient>| {
+            .map_err(|error| error!("{}", error))
+            .and_then(|rabbitmq: Arc<RabbitMQClient>| {
                 server(rabbitmq)
                     .map_err(|_error| ())
             });
@@ -163,8 +161,8 @@ impl Proxy {
         RabbitMQClient::connect(amqp_uri.as_ref())
             .map(|client| Arc::new(client))
             .map_err(|error| {
-                error!("Error in RabbitMQ client. Reason: {:?}", error);
-                PathfinderError::LapinError(error.compat().into_inner())
+                let failure_error = error.compat().into_inner();
+                PathfinderError::LapinError(failure_error)
             })
     }
 }
diff --git a/pathfinder/src/rabbitmq/client.rs b/pathfinder/src/rabbitmq/client.rs
@@ -39,7 +39,7 @@ impl RabbitMQClient {
                     .map_err(Error::from)
             })
             .and_then(|(client, heartbeat)| {
-                spawn(heartbeat.map_err(|err| error!("Heartbeat error: {:?}", err)))
+                spawn(heartbeat.map_err(|err| error!("Heartbeat error: {}", err)))
                     .into_future()
                     .map(|_| RabbitMQClient { client: Arc::new(client) })
                     .map_err(|_| err_msg("Couldn't spawn the heartbeat task."))