Merge pull request #41 from pypeclub/fix/deadline_cleanup

Deadline - cleanup, add documentation

openpype/modules/deadline/deadline_module.py

@@ -13,7 +13,7 @@ class DeadlineModule(PypeModule, IPluginPaths):
         self.deadline_url = deadline_settings["DEADLINE_REST_URL"]
 
     def get_global_environments(self):
-        """Deadline global environments for pype implementation."""
+        """Deadline global environments for OpenPype implementation."""
         return {
             "DEADLINE_REST_URL": self.deadline_url
         }

openpype/modules/deadline/plugins/publish/submit_publish_job.py

@@ -98,7 +98,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
     label = "Submit image sequence jobs to Deadline or Muster"
     order = pyblish.api.IntegratorOrder + 0.2
     icon = "tractor"
-    deadline_plugin = "Pype"
+    deadline_plugin = "OpenPype"
 
     hosts = ["fusion", "maya", "nuke", "celaction", "aftereffects", "harmony"]
 

openpype/modules/ftrack/ftrack_server/event_server_cli.py

@@ -16,7 +16,7 @@ import ftrack_api
 import pymongo
 from openpype.lib import (
     get_pype_execute_args,
-    PypeMongoConnection
+    OpenPypeMongoConnection
 )
 from openpype.modules.ftrack import FTRACK_MODULE_DIR
 from openpype.modules.ftrack.lib import (
@@ -181,7 +181,7 @@ def main_loop(ftrack_url):
 
     os.environ["FTRACK_EVENT_SUB_ID"] = str(uuid.uuid1())
 
-    mongo_uri = PypeMongoConnection.get_default_mongo_url()
+    mongo_uri = OpenPypeMongoConnection.get_default_mongo_url()
 
     # Current file
     scripts_dir = os.path.join(FTRACK_MODULE_DIR, "scripts")

openpype/modules/ftrack/ftrack_server/lib.py

@@ -24,7 +24,7 @@ except ImportError:
     from ftrack_api._weakref import WeakMethod
 from openpype.modules.ftrack.lib import get_ftrack_event_mongo_info
 
-from openpype.lib import PypeMongoConnection
+from openpype.lib import OpenPypeMongoConnection
 from openpype.api import Logger
 
 TOPIC_STATUS_SERVER = "pype.event.server.status"
@@ -144,14 +144,14 @@ class ProcessEventHub(SocketBaseEventHub):
     def prepare_dbcon(self):
         try:
             database_name, collection_name = get_ftrack_event_mongo_info()
-            mongo_client = PypeMongoConnection.get_mongo_client()
+            mongo_client = OpenPypeMongoConnection.get_mongo_client()
             self.dbcon = mongo_client[database_name][collection_name]
             self.mongo_client = mongo_client
 
         except pymongo.errors.AutoReconnect:
             self.pypelog.error((
                 "Mongo server \"{}\" is not responding, exiting."
-            ).format(PypeMongoConnection.get_default_mongo_url()))
+            ).format(OpenPypeMongoConnection.get_default_mongo_url()))
             sys.exit(0)
 
         except pymongo.errors.OperationFailure:

openpype/modules/ftrack/lib/settings.py

@@ -1,8 +1,6 @@
+import os
 from openpype.api import get_system_settings
 
-PYPE_DATABASE_NAME = "pype"
-
-
 def get_ftrack_settings():
     return get_system_settings()["modules"]["ftrack"]
 
@@ -13,6 +11,6 @@ def get_ftrack_url_from_settings():
 
 def get_ftrack_event_mongo_info():
     ftrack_settings = get_ftrack_settings()
-    database_name = PYPE_DATABASE_NAME
+    database_name = os.environ["OPENPYPE_DATABASE_NAME"]
     collection_name = "ftrack_events"
     return database_name, collection_name

openpype/modules/ftrack/scripts/sub_event_storer.py

@@ -14,7 +14,7 @@ from openpype.modules.ftrack.ftrack_server.lib import (
     TOPIC_STATUS_SERVER_RESULT
 )
 from openpype.modules.ftrack.lib import get_ftrack_event_mongo_info
-from openpype.lib import PypeMongoConnection
+from openpype.lib import OpenPypeMongoConnection
 from openpype.api import Logger
 
 log = Logger.get_logger("Event storer")
@@ -35,11 +35,11 @@ ignore_topics = []
 def install_db():
     global dbcon
     try:
-        mongo_client = PypeMongoConnection.get_mongo_client()
+        mongo_client = OpenPypeMongoConnection.get_mongo_client()
         dbcon = mongo_client[database_name][collection_name]
     except pymongo.errors.AutoReconnect:
         log.error("Mongo server \"{}\" is not responding, exiting.".format(
-            PypeMongoConnection.get_default_mongo_url()
+            OpenPypeMongoConnection.get_default_mongo_url()
         ))
         sys.exit(0)