Refactoring monitoring

Tank/Plugins/Monitoring.py

@@ -1,9 +1,9 @@
-from Monitoring.collector import MonitoringCollector
 from Tank.Core import AbstractPlugin
 from Tank.Plugins.DataUploader import DataUploaderPlugin
 from Tank.Plugins.Phantom import PhantomPlugin
 import os
 import tempfile
+from MonCollector.collector import MonitoringCollector
 
 # TODO: wait for first monitoring data
 class MonitoringPlugin(AbstractPlugin):

Tank/Plugins/Phantom.py

@@ -265,7 +265,8 @@ class PhantomPlugin(AbstractPlugin):
             self.log.debug("stpd-hash source: %s", hashed_str)
             hasher.update(hashed_str)            
             
-            os.makedirs(self.cache_dir)
+            if not os.path.exists(self.cache_dir):
+                os.makedirs(self.cache_dir)
             stpd = self.cache_dir + '/' + os.path.basename(self.ammo_file) + "_" + hasher.hexdigest() + ".stpd"
             self.log.debug("Generated cache file name: %s", stpd)
         else:

Tests/MonitoringCollectorTest.py

@@ -1,7 +1,7 @@
-from Monitoring.collector import MonitoringCollector
 from Tests.TankTests import TankTestCase
 import tempfile
 import time
+from MonCollector.collector import MonitoringCollector
 
 class  MonitoringCollectorTestCase(TankTestCase):
     data = None