x/cloud-init
Code Issues Proposed changes

set reading /proc/uptime to false by default.

Browse Source 
reading /proc/uptime is going to be slower, and no reason to do it on most
things.  Better to only do it when you suspect maybe a need for it.
This commit is contained in:
Scott Moser
2013-07-30 14:28:09 -04:00
parent d09712ac24
commit 67224e3dcd
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bin/cloud-init
View File

@@ -503,9 +503,8 @@ def main():
(name, functor) = args.action
return util.log_time(logfunc=LOG.debug,
msg="cloud-init mode '%s'" % name, uptime=True,
func=functor, args=(name, args))
return util.log_time(logfunc=LOG.debug, msg="cloud-init mode '%s'" % name,
get_uptime=True, func=functor, args=(name, args))
if __name__ == '__main__':

5
cloudinit/sources/DataSourceAzure.py
View File

@@ -207,8 +207,9 @@ def apply_hostname_bounce(hostname, policy, interface, command,
shell = not isinstance(command, (list, tuple))
# capture=False, see comments in bug 1202758 and bug 1206164.
util.log_time(logfunc=LOG.debug, msg="publishing hostname",
func=util.subp, kwargs={'command': command, 'shell': shell,
'capture': False, 'env': env})
get_uptime=True, func=util.subp,
kwargs={'command': command, 'shell': shell, 'capture': False,
'env': env})
def crtfile_to_pubkey(fname):

2
cloudinit/util.py
View File

@@ -1772,7 +1772,7 @@ def which(program):
return None
def log_time(logfunc, msg, func, args=None, kwargs=None, get_uptime=True):
def log_time(logfunc, msg, func, args=None, kwargs=None, get_uptime=False):
if args is None:
args = []
if kwargs is None: