Change: clean up timing and other progress output

1 files changed, 7 insertions, 3 deletions

diff --git a/contractor b/contractor
index 5e0c988..e8d0a3d 100755
--- a/contractor
+++ b/contractor
@@ -57,7 +57,7 @@ class ContractorApplication(cliapp.Application):
         self.output.write('{}\n'.format(json.dumps(bs.as_dict(), indent=4)))
 
     def cmd_build(self, args):
-        self.verbose('building using spec at {}'.format(args[0]))
+        self.verbose('building according to {}'.format(args[0]))
         bs = self.load_build_spec(args[0])
         dest = self.manager_destination()
         manager = RemoteServer(dest, verbose=self.verbose)
@@ -143,20 +143,24 @@ class ContractorApplication(cliapp.Application):
             return BuildSpec(f.read())
 
     def upload_worker_image(self, filename, dest):
-        self.verbose('uploading worker to manager: {}'.format(filename))
+        self.verbose(
+            'uploading to manager local worker image {}'.format(filename))
         target = '{}:{}'.format(dest, WORKER_IMG)
         if rsync(filename, target).failed():
             self.error('could not upload image to worker')
             sys.exit(1)
 
     def sync_to_workspace(self, frm, dest, subdir):
+        destdir = '/mnt/{}'.format(subdir)
+        self.verbose('syncing local {} to manager {}'.format(frm, destdir))
         er = rsync(
-            '{}/.'.format(frm), '{}:/mnt/{}/.'.format(dest, subdir))
+            '{}/.'.format(frm), '{}:{}/.'.format(dest, destdir))
         if er.failed():
             self.error('Failed to rsync saved workspace to worker')
             sys.exit(1)
 
     def sync_from_workspace(self, dest, ws):
+        self.verbose('syncing manager /mnt to local {}'.format(ws))
         if not os.path.exists(ws):
             os.makedirs(ws)
         er = rsync('{}:/mnt/.'.format(dest), '{}/.'.format(ws))