From 5068291b1a479c9783ced01ba1c5b0f79591a913 Mon Sep 17 00:00:00 2001
From: Teyras <Teyras@gmail.com>
Date: Thu, 5 Apr 2018 12:10:10 +0200
Subject: [PATCH] Better log messages during queueing

---
 src/handlers/broker_handler.cpp       | 11 +++++++----
 src/queuing/queue_manager_interface.h |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/handlers/broker_handler.cpp b/src/handlers/broker_handler.cpp
index d6b030f..5c5cdba 100644
--- a/src/handlers/broker_handler.cpp
+++ b/src/handlers/broker_handler.cpp
@@ -279,8 +279,6 @@ void broker_handler::process_worker_done(
 
 		if (next_request != nullptr) {
 			send_request(worker, next_request, respond);
-		} else {
-			logger_->debug(" - worker {} is now free", worker->get_description());
 		}
 
 		runtime_stats_[STATS_EVALUATED_JOBS] += 1;
@@ -329,6 +327,10 @@ void broker_handler::process_worker_done(
 	} else {
 		logger_->warn("Received unexpected status code {} from worker {}", status, worker->get_description());
 	}
+
+	if (queue_->get_current_request(worker) == nullptr) {
+		logger_->debug(" - worker {} is now free", worker->get_description());
+	}
 }
 
 void broker_handler::process_worker_ping(
@@ -447,13 +449,14 @@ bool broker_handler::reassign_request(worker::request_ptr request, handler_inter
 
 	if (!result.enqueued) {
 		notify_monitor(request, "FAILED", respond);
+		logger_->debug(" - failed to enqueue job {}", request->data.get_job_id());
 		return false;
 	}
 
 	if (result.assigned_to != nullptr) {
 		send_request(result.assigned_to, request, respond);
-		logger_->debug(
-			" - job {} queued for worker {}", request->data.get_job_id(), result.assigned_to->get_description());
+	} else {
+		logger_->debug(" - job {} is now waiting in the queue", request->data.get_job_id());
 	}
 
 	return true;
diff --git a/src/queuing/queue_manager_interface.h b/src/queuing/queue_manager_interface.h
index 7d0f4f2..afa4ca8 100644
--- a/src/queuing/queue_manager_interface.h
+++ b/src/queuing/queue_manager_interface.h
@@ -17,7 +17,7 @@ struct enqueue_result {
 	worker_ptr assigned_to;
 
 	/**
-	 * True if the request was successfully enqueued, false otherwise
+	 * True if the request was successfully enqueued or assigned to a worker, false otherwise
 	 */
 	bool enqueued;
 };