Merge pull request #575 from fomars/master

hotfix: Unicode job name & description
yandex · Apr 26, 2018 · 24e7331 · 24e7331
2 parents 985f7d9 + 8ee625e
commit 24e7331
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/yandextank/core/tankcore.py b/yandextank/core/tankcore.py
@@ -293,7 +293,7 @@ def plugins_end_test(self, retcode):
                 retcode = plugin.end_test(retcode)
                 logger.debug("RC after: %s", retcode)
             except Exception:  # FIXME too broad exception clause
-                logger.error("Failed finishing plugin %s: %s", plugin, exc_info=True)
+                logger.error("Failed finishing plugin %s", plugin, exc_info=True)
                 if not retcode:
                     retcode = 1
         return retcode
@@ -311,7 +311,7 @@ def plugins_post_process(self, retcode):
                 retcode = plugin.post_process(retcode)
                 logger.debug("RC after: %s", retcode)
             except Exception:  # FIXME too broad exception clause
-                logger.error("Failed post-processing plugin %s: %s", plugin, exc_info=True)
+                logger.error("Failed post-processing plugin %s", plugin, exc_info=True)
                 if not retcode:
                     retcode = 1
         self.__collect_artifacts()

diff --git a/yandextank/plugins/DataUploader/plugin.py b/yandextank/plugins/DataUploader/plugin.py
@@ -292,8 +292,10 @@ def post_process(self, rc):
         self.monitoring_queue.put(None)
         self.data_queue.put(None)
         logger.info("Waiting for sender threads to join.")
-        self.monitoring.join()
-        self.upload.join()
+        if self.monitoring.is_alive():
+            self.monitoring.join()
+        if self.upload.is_alive():
+            self.upload.join()
         self.finished = True
         try:
             self.lp_job.close(rc)
@@ -573,8 +575,8 @@ def __get_lp_job(self):
                      token=self.get_option('upload_token'),
                      person=self.__get_operator(),
                      task=self.task,
-                     name=self.get_option('job_name', 'none').decode('utf8'),
-                     description=self.get_option('job_dsc').decode('utf8'),
+                     name=self.get_option('job_name', 'none'),
+                     description=self.get_option('job_dsc'),
                      tank=self.core.job.tank,
                      notify_list=self.get_option("notify"),
                      load_scheme=loadscheme,