Merge remote-tracking branch 'telmich/master'

bin/cdist

@@ -21,11 +21,11 @@
 #
 
 import argparse
-import datetime
 import logging
 import os
 import re
 import sys
+import time
 
 log = logging.getLogger("cdist")
 
@@ -112,7 +112,7 @@ def configinstall(args, mode):
     """Configure or install remote system"""
     process = {}
 
-    time_start = datetime.datetime.now()
+    time_start = time.time()
 
     os.environ['__remote_exec'] = "ssh -o User=root -q"
     os.environ['__remote_copy'] = "scp -o User=root -q"
@@ -133,17 +133,15 @@ def configinstall(args, mode):
 
     # FIXME: error handling for parallel mode!
 
-    time_end = datetime.datetime.now()
+    time_end = time.time()
     log.info("Total processing time for %s host(s): %s", len(args.host),
-                (time_end - time_start).total_seconds())
+                (time_end - time_start))
 
 
 if __name__ == "__main__":
     try:
         logging.basicConfig(format='%(levelname)s: %(message)s')
 
-        time_start = datetime.datetime.now()
-
         if re.match(TYPE_PREFIX, os.path.basename(sys.argv[0])):
             import cdist.emulator
             cdist.emulator.run(sys.argv)
@@ -154,13 +152,6 @@ if __name__ == "__main__":
 
             commandline()
 
-        time_end = datetime.datetime.now()
-        duration = time_end - time_start
-        # FIXME: move into runner
-        # log.info("Finished run of %s in %s seconds", self.target_host,
-        #     duration.total_seconds())
-        log.info("Finished run in %s seconds", duration.total_seconds())
-
     except KeyboardInterrupt:
         sys.exit(0)
     except cdist.Error as e:

doc/dev/todo/niconext

@@ -331,3 +331,4 @@ eof
 
 - remote_prefix:
    scp vs. ssh issue
+locale_type

lib/cdist/config.py

@@ -20,14 +20,7 @@
 #
 #
 
-import datetime
-import logging
-import os
-import sys
-
 import cdist.config_install
 
-log = logging.getLogger(__name__)
-
 class Config(cdist.config_install.ConfigInstall):
     pass

lib/cdist/config_install.py

@@ -24,6 +24,7 @@ import logging
 import os
 import stat
 import sys
+import time
 
 import cdist.context
 import cdist.core
@@ -194,7 +195,7 @@ class ConfigInstall:
         self.transfer_object_parameter(cdist_object)
 
         for explorer in cdist_type.explorers:
-            remote_cmd = cmd + [os.path.join(self.context.type_base_path,
+            remote_cmd = cmd + [os.path.join(self.context.remote_base_path,
                 cdist_type.explorer_path, explorer)]
             output = os.path.join(self.context.object_base_path,
                         cdist_object.explorer_path, explorer)
@@ -230,7 +231,7 @@ class ConfigInstall:
             output_fd = open(os.path.join(dst_path, explorer), mode='w')
             cmd = []
             cmd.append("__explorer=" + remote_dst_path)
-            cmd.append(os.path.join(src_path, explorer))
+            cmd.append(os.path.join(remote_dst_path, explorer))
 
             cdist.exec.run_or_fail(cmd, stdout=output_fd, remote_prefix=True)
             output_fd.close()
@@ -252,8 +253,11 @@ class ConfigInstall:
 
     def deploy_and_cleanup(self):
         """Do what is most often done: deploy & cleanup"""
+        start_time = time.time()
         self.deploy_to()
         self.cleanup()
+        log.info("Finished run of %s in %s seconds", 
+            self.target_host, time.time() - start_time)
 
     def stage_prepare(self):
         """Do everything for a deploy, minus the actual code stage"""