Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reduce logging #645

Merged
merged 1 commit into from
Apr 3, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions azurelinuxagent/ga/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ def run_latest(self):
stderr=sys.stderr,
env=os.environ)

logger.info(u"Agent {0} launched with command '{1}'", agent_name, agent_cmd)
logger.verbose(u"Agent {0} launched with command '{1}'", agent_name, agent_cmd)

ret = None
start_time = time.time()
Expand Down Expand Up @@ -331,7 +331,7 @@ def _upgrade_available(self, base_version=CURRENT_VERSION):
return False

family = conf.get_autoupdate_gafamily()
logger.info("Checking for agent family {0} updates", family)
logger.verbose("Checking for agent family {0} updates", family)

self.last_attempt_time = now
try:
Expand All @@ -351,7 +351,7 @@ def _upgrade_available(self, base_version=CURRENT_VERSION):
manifests = [m for m in manifest_list.vmAgentManifests \
if m.family == family and len(m.versionsManifestUris) > 0]
if len(manifests) == 0:
logger.info(u"Incarnation {0} has no agent family {1} updates", etag, family)
logger.verbose(u"Incarnation {0} has no agent family {1} updates", etag, family)
return False

try:
Expand Down Expand Up @@ -598,7 +598,7 @@ def __init__(self, path=None, pkg=None, host=None):
self.version = FlexibleVersion(version)

location = u"disk" if path is not None else u"package"
logger.info(u"Instantiating Agent {0} from {1}", self.name, location)
logger.verbose(u"Instantiating Agent {0} from {1}", self.name, location)

self.error = None
self._load_error()
Expand Down Expand Up @@ -654,14 +654,14 @@ def mark_failure(self, is_fatal=False):

def _ensure_downloaded(self):
try:
logger.info(u"Ensuring Agent {0} is downloaded", self.name)
logger.verbose(u"Ensuring Agent {0} is downloaded", self.name)

if self.is_blacklisted:
logger.info(u"Agent {0} is blacklisted - skipping download", self.name)
logger.warn(u"Agent {0} is blacklisted - skipping download", self.name)
return

if self.is_downloaded:
logger.info(u"Agent {0} was previously downloaded - skipping download", self.name)
logger.verbose(u"Agent {0} was previously downloaded - skipping download", self.name)
self._load_manifest()
return

Expand All @@ -675,7 +675,7 @@ def _ensure_downloaded(self):
self._load_error()

msg = u"Agent {0} downloaded successfully".format(self.name)
logger.info(msg)
logger.verbose(msg)
add_event(
AGENT_NAME,
version=self.version,
Expand Down Expand Up @@ -742,7 +742,7 @@ def _fetch(self, uri, headers=None):
fileutil.write_file(self.get_agent_pkg_path(),
bytearray(package),
asbin=True)
logger.info(u"Agent {0} downloaded from {1}", self.name, uri)
logger.verbose(u"Agent {0} downloaded from {1}", self.name, uri)
else:
logger.verbose("Fetch was unsuccessful [{0}]",
HostPluginProtocol.read_response_error(resp))
Expand All @@ -758,7 +758,7 @@ def _load_error(self):
if self.error is None:
self.error = GuestAgentError(self.get_agent_error_file())
self.error.load()
logger.info(u"Agent {0} error state: {1}", self.name, ustr(self.error))
logger.verbose(u"Agent {0} error state: {1}", self.name, ustr(self.error))
except Exception as e:
logger.warn(u"Agent {0} failed loading error state: {1}", self.name, ustr(e))
return
Expand Down Expand Up @@ -794,7 +794,7 @@ def _load_manifest(self):
ustr(e))
raise UpdateError(msg)

logger.info(
logger.verbose(
u"Agent {0} loaded manifest from {1}",
self.name,
self.get_agent_manifest_path())
Expand Down Expand Up @@ -824,7 +824,7 @@ def _unpack(self):
self.get_agent_dir())
raise UpdateError(msg)

logger.info(
logger.verbose(
u"Agent {0} unpacked successfully to {1}",
self.name,
self.get_agent_dir())
Expand Down