From 2a941e3abf91266fd10a7cd326411829d107dee3 Mon Sep 17 00:00:00 2001
From: allegroai <>
Date: Sat, 16 Oct 2021 23:21:12 +0300
Subject: [PATCH] Fix --stop checking default queue tag (issue #80)

---
 clearml_agent/commands/worker.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/clearml_agent/commands/worker.py b/clearml_agent/commands/worker.py
index 07d4daa..38a26ed 100644
--- a/clearml_agent/commands/worker.py
+++ b/clearml_agent/commands/worker.py
@@ -1278,15 +1278,15 @@ class Worker(ServiceCommandSection):
         if self._services_mode and dynamic_gpus:
             raise ValueError("Combining --dynamic-gpus and --services-mode is not supported")
 
-        # if we do not need to create queues, make sure they are valid
-        # match previous behaviour when we validated queue names before everything else
-        queues = self._resolve_queue_names(queues, create_if_missing=kwargs.get('create_queue', False))
-
         # We are not running a daemon we are killing one.
         # find the pid send termination signal and leave
         if kwargs.get('stop', False):
             return 1 if not self._kill_daemon(dynamic_gpus=dynamic_gpus) else 0
 
+        # if we do not need to create queues, make sure they are valid
+        # match previous behaviour when we validated queue names before everything else
+        queues = self._resolve_queue_names(queues, create_if_missing=kwargs.get('create_queue', False))
+
         queues_info = [
             q.to_dict()
             for q in self._session.send_api(