Skip to content

Commit

Permalink
Restore the push encap config streamlog suppression
Browse files Browse the repository at this point in the history
  • Loading branch information
cvaroqui committed Oct 23, 2017
1 parent 5cb6c01 commit 6af8afb
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion lib/svc.py
Expand Up @@ -2029,7 +2029,7 @@ def _encap_cmd(self, cmd, container, verbose=False, push_config=True):

# make sure the container has an up-to-date service config
if push_config:
self.push_encap_config(container)
self._push_encap_config(container)

# now we known we'll execute a command in the slave, so purge the
# encap cache
Expand Down Expand Up @@ -2965,6 +2965,15 @@ def push_encap_config(self):
self._push_encap_config(resource)

def _push_encap_config(self, container):
if len(self.log.handlers) > 1:
self.log.handlers[1].setLevel(logging.CRITICAL)
try:
self.__push_encap_config(container)
finally:
if len(self.log.handlers) > 1:
self.log.handlers[1].setLevel(rcEnv.loglevel)

def __push_encap_config(self, container):
"""
Compare last modification time of the master and slave service
configuration file, and copy the most recent version over the least
Expand Down

0 comments on commit 6af8afb

Please sign in to comment.