← Back to branch summary

~le-charmers/charms/trusty/percona-cluster/leadership-election

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/core/hookenv.py

  • Committer: james.page at ubuntu
  • Date: 2015-03-09 14:46:55 UTC
  • Revision ID: james.page@ubuntu.com-20150309144655-gs7rbrvfnzztkbg2
Resync helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/core/hookenv.py
596
596
        raise NotImplementedError
597
597
 
598
598
 
599
 
@cached
600
599
@translate_exc(from_exc=CalledProcessError, to_exc=NotImplementedError)
601
600
def leader_get(attribute=None):
602
601
    """Juju leader get value(s)"""
603
602
    cmd = ['leader-get', '--format=json'] + [attribute or '-']
604
603
    try:
605
 
        return json.loads(subprocess.check_output(cmd).decode('UTF-8'))
 
604
        ret = json.loads(subprocess.check_output(cmd).decode('UTF-8'))
 
605
        log("Juju leader-get '%s' = '%s'" % (attribute, ret), level=DEBUG)
 
606
        return ret
606
607
    except ValueError:
607
608
        return None
608
609
    except CalledProcessError as e:
615
616
@translate_exc(from_exc=CalledProcessError, to_exc=NotImplementedError)
616
617
def leader_set(settings=None, **kwargs):
617
618
    """Juju leader set value(s)"""
 
619
    log("Juju leader-set '%s'" % (settings), level=DEBUG)
618
620
    cmd = ['leader-set']
619
621
    settings = settings or {}
620
622
    settings.update(kwargs)