diff options
author | Scott Moser <smoser@ubuntu.com> | 2010-06-17 11:29:34 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2010-06-17 11:29:34 -0400 |
commit | afb5f8da541f97a9fc5c023cac7dc55b5b81dd06 (patch) | |
tree | c2ee0bb23d94f69e5650b728938ab5f7e1e13f56 /cloudinit/DataSourceEc2.py | |
parent | a9f600c4fb7426661c478f043791795ddbabb69a (diff) | |
download | vyos-cloud-init-afb5f8da541f97a9fc5c023cac7dc55b5b81dd06.tar.gz vyos-cloud-init-afb5f8da541f97a9fc5c023cac7dc55b5b81dd06.zip |
add initial logging support
This logging infrastructure in cloudinit:
- uses python logging
- allows user supplied config of logging.config.fileConfig format to be
supplied in /etc/cloud/cloud.cfg or in cloud_config by user data.
- by default, tries to use syslog, if that is not available, writes directly to
/var/log/cloud-init.log (syslog will not be available yet when cloud-init
runs)
- when using syslog, the doc/21-cloudinit.conf file provides a rsyslogd
file to be placed in /etc/rsyslog.d/ that will file [CLOUDINIT] messages
to /var/log/cloud-init.log
Diffstat (limited to 'cloudinit/DataSourceEc2.py')
-rw-r--r-- | cloudinit/DataSourceEc2.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cloudinit/DataSourceEc2.py b/cloudinit/DataSourceEc2.py index ad88a704..ebee61c6 100644 --- a/cloudinit/DataSourceEc2.py +++ b/cloudinit/DataSourceEc2.py @@ -126,14 +126,14 @@ class DataSourceEc2(DataSource.DataSource): reason = "url error [%s]" % e.reason if x == 0: - sys.stderr.write("waiting for metadata service at %s\n" % url) + cloudinit.log.warning("waiting for metadata service at %s\n" % url) - sys.stderr.write(" %s [%02s/%s]: %s\n" % - (time.strftime("%H:%M:%S"), x+1, sleeps, reason)) + cloudinit.log.warning(" %s [%02s/%s]: %s\n" % + (time.strftime("%H:%M:%S"), x+1, sleeps, reason)) time.sleep(sleeptime) - sys.stderr.write("giving up on md after %i seconds\n" % - int(time.time()-starttime)) + log.critical("giving up on md after %i seconds\n" % + int(time.time()-starttime)) return False def get_public_ssh_keys(self): |