summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Edwards <jeremyje@gmail.com>2014-04-25 15:19:41 -0700
committerJeremy Edwards <jeremyje@gmail.com>2014-04-25 15:19:41 -0700
commit2186d1e65860356ef6ed53c728d1f8f9157c8b1c (patch)
tree261ad8809360d2d43f047a7eca4e20386b3b1cf5
parent2644cee85e1a73d47390652522a59f0470746de9 (diff)
parentc3bf2aef16dc25fe515e9e9304e3f73046a7fd82 (diff)
downloadgoogle-compute-image-packages-2186d1e65860356ef6ed53c728d1f8f9157c8b1c.tar.gz
Merge pull request #66 from kimasaki/master
Changed normal sshkeys metadata query log entries from level INFO to DEBUG since it is not necessary to log.
-rwxr-xr-xgoogle-daemon/usr/share/google/google_daemon/desired_accounts.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/google-daemon/usr/share/google/google_daemon/desired_accounts.py b/google-daemon/usr/share/google/google_daemon/desired_accounts.py
index 702741d..51438e0 100755
--- a/google-daemon/usr/share/google/google_daemon/desired_accounts.py
+++ b/google-daemon/usr/share/google/google_daemon/desired_accounts.py
@@ -144,7 +144,7 @@ class DesiredAccounts(object):
INSTANCE_SSHKEYS_URL,
etag = self.instance_sshkeys_etag)
if attribute_data:
- logging.info('Found instance sshKeys attribute.')
+ logging.debug('Found instance sshKeys attribute.')
# There is an sshKeys attribute on the instance. Use it
account_data = attribute_data[0]
self.instance_sshkeys_etag = attribute_data[1]
@@ -153,15 +153,15 @@ class DesiredAccounts(object):
# use a hanging get here since it is possible this call may take
# a long time and during that the instance metadata can change which
# we will miss.
- logging.info(
+ logging.debug(
'Instance sshKeys attribute not found. Falling back to project')
attribute_data = self._GetAttribute(PROJECT_SSHKEYS_URL)
if attribute_data:
- logging.info('Project sshKeys attribute found.')
+ logging.debug('Project sshKeys attribute found.')
# There is an sshKeys attribute. Use it
account_data = attribute_data[0]
else:
- logging.info('Project sshKeys attribute not found.')
+ logging.debug('Project sshKeys attribute not found.')
# sshKeys doesn't exist for either project or instance.
account_data = None