Merge pull request #577 from yandex/master

hotfix unicode job name
yandex · Apr 26, 2018 · 895939a · 895939a
2 parents a9bd1b4 + 24e7331
commit 895939a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
@@ -381,9 +381,9 @@ Now, our basic config looks like that:
 
   phantom:
     address: 203.0.113.1:443
-    load_profile:
-      load_type: rps
-      schedule: line(1, 10, 10m)
+      load_profile:
+        load_type: rps
+        schedule: line(1, 10, 10m)
     ssl: true
 
 .. note::

diff --git a/yandextank/core/tankcore.py b/yandextank/core/tankcore.py
@@ -302,7 +302,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
@@ -320,7 +320,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
@@ -315,8 +315,10 @@ def post_process(self, rc):
             self.events_processing.close()
             self.events.join()
         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)
@@ -584,8 +586,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,