Skip to content

Commit

Permalink
Merge "Lowering certain log lines from error to info"
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins authored and openstack-gerrit committed Nov 13, 2012
2 parents cfd26c9 + bf397e3 commit 2bd8ee5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions glance/common/wsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def start(self, application, default_port):
"""
def kill_children(*args):
"""Kills the entire process group."""
self.logger.error(_('SIGTERM or SIGINT received'))
self.logger.info(_('SIGTERM or SIGINT received'))
signal.signal(signal.SIGTERM, signal.SIG_IGN)
signal.signal(signal.SIGINT, signal.SIG_IGN)
self.running = False
Expand All @@ -185,7 +185,7 @@ def hup(*args):
"""
Shuts down the server, but allows running requests to complete
"""
self.logger.error(_('SIGHUP received'))
self.logger.info(_('SIGHUP received'))
signal.signal(signal.SIGHUP, signal.SIG_IGN)
self.running = False

Expand Down Expand Up @@ -217,13 +217,13 @@ def wait_on_children(self):
try:
pid, status = os.wait()
if os.WIFEXITED(status) or os.WIFSIGNALED(status):
self.logger.error(_('Removing dead child %s') % pid)
self.logger.info(_('Removing dead child %s') % pid)
self.children.remove(pid)
if os.WIFEXITED(status) and os.WEXITSTATUS(status) != 0:
self.logger.error(_('Not respawning child %d, cannot '
'recover from termination') % pid)
if not self.children:
self.logger.error(
self.logger.info(
_('All workers have terminated. Exiting'))
self.running = False
else:
Expand Down

0 comments on commit 2bd8ee5

Please sign in to comment.