From d9084dd28dc32d7389972bf9c7026ddf72749105 Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej@samohel.cz>
Date: Mon, 2 Sep 2019 22:29:22 +0200
Subject: [PATCH] fixed multiple errors, synced with 3de

---
 .../global/publish/submit_publish_job.py       | 14 +++++---------
 .../plugins/maya/publish/submit_maya_muster.py | 18 +++++++++++++-----
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/pype/plugins/global/publish/submit_publish_job.py b/pype/plugins/global/publish/submit_publish_job.py
index 057fd2362c..a3ea308891 100644
--- a/pype/plugins/global/publish/submit_publish_job.py
+++ b/pype/plugins/global/publish/submit_publish_job.py
@@ -212,28 +212,24 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
         """
         # Get a submission job
         data = instance.data.copy()
-        job = instance.data.get("deadlineSubmissionJob")
+        render_job = data.pop("deadlineSubmissionJob")
         submission_type = "deadline"
 
-        if not job:
+        if not render_job:
             # No deadline job. Try Muster: musterSubmissionJob
-            job = data.pop("musterSubmissionJob")
+            render_job = data.pop("musterSubmissionJob")
             submission_type = "muster"
-            if not job:
+            if not render_job:
                 raise RuntimeError("Can't continue without valid Deadline "
                                    "or Muster submission prior to this "
                                    "plug-in.")
 
         if submission_type == "deadline":
-            render_job = data.pop("deadlineSubmissionJob")
             self.DEADLINE_REST_URL = os.environ.get("DEADLINE_REST_URL",
                                                     "http://localhost:8082")
             assert self.DEADLINE_REST_URL, "Requires DEADLINE_REST_URL"
 
-            self._submit_deadline_post_job(instance, job)
-
-        if submission_type == "muster":
-            render_job = data.pop("musterSubmissionJob")
+            self._submit_deadline_post_job(instance, render_job)
 
         asset = data.get("asset") or api.Session["AVALON_ASSET"]
         subset = data["subset"]
diff --git a/pype/plugins/maya/publish/submit_maya_muster.py b/pype/plugins/maya/publish/submit_maya_muster.py
index 448b888518..13a24c0a52 100644
--- a/pype/plugins/maya/publish/submit_maya_muster.py
+++ b/pype/plugins/maya/publish/submit_maya_muster.py
@@ -10,7 +10,7 @@ import platform
 from pypeapp import config
 
 
-# mapping between Maya rendere names and Muster template ids
+# mapping between Maya renderer names and Muster template ids
 def _get_template_id(renderer):
     """
     Return muster template ID based on renderer name.
@@ -230,6 +230,7 @@ class MayaSubmitMuster(pyblish.api.InstancePlugin):
         """
         self.log.info("Trying to find template for [{}]".format(renderer))
         mapped = _get_template_id(renderer)
+        self.log.info("got id [{}]".format(mapped))
         return self._templates.get(mapped)
 
     def _submit(self, payload):
@@ -262,11 +263,18 @@ class MayaSubmitMuster(pyblish.api.InstancePlugin):
         render publish job and submit job to farm.
         """
         # setup muster environment
-        self.MUSTER_REST_URL = os.environ.get("MUSTER_REST_URL",
-                                              "https://localhost:9891")
+        self.MUSTER_REST_URL = os.environ.get("MUSTER_REST_URL")
+
+        if self.MUSTER_REST_URL is None:
+            self.log.error(
+                "\"MUSTER_REST_URL\" is not found. Skipping "
+                "[{}]".format(instance)
+            )
+            raise RuntimeError("MUSTER_REST_URL not set")
+
         self._load_credentials()
         self._authenticate()
-        self._get_templates()
+        # self._get_templates()
 
         context = instance.context
         workspace = context.data["workspaceDir"]
@@ -354,7 +362,7 @@ class MayaSubmitMuster(pyblish.api.InstancePlugin):
                 "platform": 0,
                 "job": {
                     "jobName": jobname,
-                    "templateId": self._resolve_template(
+                    "templateId": self._get_template_id(
                         instance.data["renderer"]),
                     "chunksInterleave": 2,
                     "chunksPriority": "0",