Merge pull request #46 from Azure/develop

 Fix for data_dir not existing when logfile created and prep for release

Author: davidkydd

CHANGES.txt

@@ -1,3 +1,8 @@
+2019.05.06 v0.25.0
+------------------
+- Bug fix for log directory not existing when it is created and path building on Maya 2019
+
+
 2019.30.05 v0.24.0
 ------------------
 - Numerous small bug fixes

azure_batch_maya/plug-in/AzureBatch.py

@@ -54,7 +54,7 @@
     "azure-batch-extensions==1.0.1": "azure.batch_extensions"
 }
 
-VERSION = "0.24.0"
+VERSION = "0.25.0"
 EULA_PREF = "AzureBatch_EULA"
 SHELF_FILE = "shelf_AzureBatch.mel"
 cmd_name = "AzureBatch"

azure_batch_maya/scripts/config.py

@@ -50,6 +50,13 @@ class AzureBatchConfig(object):
 
     def __init__(self):
         self._data_dir = os.path.join(maya.prefs_dir(), 'AzureBatchData')
+        if not os.path.isdir(self._data_dir):
+            try:
+                os.makedirs(self._data_dir)
+            except OSError as exc: # Guard against race condition
+                if exc.errno != errno.EEXIST:
+                    raise
+
         self._log = self._configure_logging(LOG_LEVELS['debug'])    #config hasn't been loaded yet so use a default logging level
 
     def initialize_ui(self, index, settings, frame, start, call):
@@ -269,8 +276,6 @@ def _configure_plugin(self, from_auth_button):
         """Set up the config file, authenticate the SDK clients
         and set up the log file.
         """
-        if not os.path.exists(self._data_dir):
-            os.makedirs(self._data_dir)
         config_file = os.path.join(self._data_dir, self._ini_file)
 
         try:
@@ -415,7 +420,7 @@ def _configure_logging(self, log_level):
         if len(logger.handlers) == 0:
             file_format = logging.Formatter(
                 "%(asctime)-15s [%(levelname)s] %(module)s: %(message)s")
-            logfile = os.path.join(self._data_dir, "azure_batch.log")
+            logfile = os.path.normpath(os.path.join(self._data_dir, "azure_batch.log"))
             if not os.path.exists(logfile):
                 with open(logfile, 'w') as handle:
                     handle.write("Azure Batch Plugin Log\n")