Lose a few lines by adding 'verbose' flag

4 files changed, 17 insertions, 25 deletions

diff --git a/ybd/app.py b/ybd/app.py
index 97d294b..9e94d35 100644
--- a/ybd/app.py
+++ b/ybd/app.py
@@ -42,17 +42,15 @@ config = {}
 
 class RetryException(Exception):
     def __init__(self, defs, component):
-        if config.get('log-verbose') and \
-                config.get('last-retry-component') != component:
-            log(component, 'Already downloading/building, so wait/retry')
+        if config.get('last-retry-component') != component:
+            log(component, 'Already assembling, so wait/retry', verbose=True)
         if config.get('last-retry-time'):
             wait = datetime.datetime.now() - config.get('last-retry-time')
             if wait.seconds < 1:
                 with open(lockfile(defs, component), 'r') as l:
                     call(['flock', '--shared', '--timeout',
                           config.get('timeout', '60'), str(l.fileno())])
-                if config['log-verbose']:
-                    log(component, 'Finished wait loop')
+                log(component, 'Finished wait loop', verbose=True)
         config['last-retry-time'] = datetime.datetime.now()
         config['last-retry-component'] = component
         for dirname in config['sandboxes']:
@@ -87,9 +85,12 @@ def lockfile(defs, this):
     return os.path.join(config['tmp'], cache_key(defs, this) + '.lock')
 
 
-def log(component, message='', data=''):
+def log(component, message='', data='', verbose=False):
     ''' Print a timestamped log. '''
 
+    if verbose is True and config.get('log-verbose', False) is False:
+        return
+
     name = component['name'] if type(component) is dict else component
 
     timestamp = datetime.datetime.now().strftime('%y-%m-%d %H:%M:%S ')
diff --git a/ybd/assembly.py b/ybd/assembly.py
index a68ab2c..058f2e7 100644
--- a/ybd/assembly.py
+++ b/ybd/assembly.py
@@ -46,8 +46,7 @@ def compose(defs, target):
     if get_cache(defs, component):
         return cache_key(defs, component)
 
-    if config.get('log-verbose'):
-        log(target, "Composing", component['name'])
+    log(target, "Composing", component['name'], verbose=True)
 
     # if we have a kbas, look there to see if this component exists
     if config.get('kbas-url') and not config.get('reproduce'):
@@ -171,8 +170,7 @@ def install_contents(defs, component):
             if os.path.exists(os.path.join(component['sandbox'], 'baserock',
                                            content['name'] + '.meta')):
                 # content has already been installed
-                if config.get('log-verbose'):
-                    log(component, 'Already installed', content['name'])
+                log(component, 'Already did', content['name'], verbose=True)
                 continue
 
             if component.get('kind', 'chunk') == 'system':
@@ -196,8 +194,7 @@ def install_contents(defs, component):
 
     component = defs.get(component)
     contents = component.get('contents', [])
-    if config.get('log-verbose'):
-        log(component, 'Installing contents\n', contents)
+    log(component, 'Installing contents\n', contents, verbose=True)
     install(defs, component, contents)
     if config.get('log-verbose'):
         sandbox.list_files(component)
@@ -213,8 +210,7 @@ def install_dependencies(defs, component):
             if os.path.exists(os.path.join(component['sandbox'], 'baserock',
                                            dependency['name'] + '.meta')):
                 # dependency has already been installed
-                if config.get('log-verbose'):
-                    log(component, 'Already installed', dependency['name'])
+                log(component, 'Already did', dependency['name'], verbose=True)
                 continue
 
             install(defs, component, dependency.get('build-depends', []))
@@ -228,8 +224,7 @@ def install_dependencies(defs, component):
 
     component = defs.get(component)
     dependencies = component.get('build-depends', [])
-    if config.get('log-verbose'):
-        log(component, 'Installing dependencies\n', dependencies)
+    log(component, 'Installing dependencies\n', dependencies, verbose=True)
     install(defs, component, dependencies)
     if config.get('log-verbose'):
         sandbox.list_files(component)
diff --git a/ybd/sandbox.py b/ybd/sandbox.py
index 6d93576..860814d 100644
--- a/ybd/sandbox.py
+++ b/ybd/sandbox.py
@@ -67,8 +67,7 @@ def setup(this):
     finally:
         pass
 
-    if app.config.get('log-verbose'):
-        app.log(this, "Removing sandbox dir", this['sandbox'])
+    app.log(this, "Removing sandbox dir", this['sandbox'], verbose=True)
     app.remove_dir(this['sandbox'])
 
 
@@ -77,8 +76,7 @@ def install(defs, this, component):
     if os.path.exists(os.path.join(this['sandbox'], 'baserock',
                                    component['name'] + '.meta')):
         return
-    if app.config.get('log-verbose'):
-        app.log(this, 'Sandbox: installing %s' % component['cache'])
+    app.log(this, 'Sandbox: installing %s' % component['cache'], verbose=True)
     if cache.get_cache(defs, component) is False:
         app.exit(this, 'ERROR: unable to get cache for', component['name'])
     unpackdir = cache.get_cache(defs, component) + '.unpacked'
diff --git a/ybd/splitting.py b/ybd/splitting.py
index 0cf4f2c..6fba690 100644
--- a/ybd/splitting.py
+++ b/ybd/splitting.py
@@ -48,9 +48,8 @@ def install_stratum_artifacts(defs, component, stratum, artifacts):
                 components += product['components']
                 split_stratum_metadata['products'].append(product)
 
-    if app.config.get('log-verbose'):
-        app.log(component, 'Installing artifacts: ' + str(artifacts) +
-                ' components: ' + str(components))
+    app.log(component, 'Installing artifacts:', artifacts, verbose=True)
+    app.log(component, 'Installing components:', components, verbose=True)
 
     baserockpath = os.path.join(component['sandbox'], 'baserock')
     if not os.path.isdir(baserockpath):
@@ -140,8 +139,7 @@ def get_metadata(defs, component):
     try:
         with open(get_metafile(defs, component), "r") as f:
             metadata = yaml.safe_load(f)
-        if app.config.get('log-verbose'):
-            app.log(component, 'Loaded metadata for', component['path'])
+        app.log(component, 'Loaded metadata for', component['path'], verbose=True)
         return metadata
     except:
         app.log(component, 'WARNING: problem loading metadata', component)