diff options
Diffstat (limited to 'gitautodeploy')
| -rw-r--r-- | gitautodeploy/cli/config.py | 1 | ||||
| -rw-r--r-- | gitautodeploy/gitautodeploy.py | 14 |
2 files changed, 9 insertions, 6 deletions
diff --git a/gitautodeploy/cli/config.py b/gitautodeploy/cli/config.py index 906f956..f0ac68a 100644 --- a/gitautodeploy/cli/config.py +++ b/gitautodeploy/cli/config.py @@ -13,6 +13,7 @@ def get_config_defaults(): config['logfilepath'] = None config['host'] = '0.0.0.0' config['port'] = 8001 + config['intercept-stdout'] = True return config diff --git a/gitautodeploy/gitautodeploy.py b/gitautodeploy/gitautodeploy.py index 812f858..5c317ec 100644 --- a/gitautodeploy/gitautodeploy.py +++ b/gitautodeploy/gitautodeploy.py @@ -177,8 +177,9 @@ class GitAutoDeploy(object): logger = logging.getLogger() logger.info('Goodbye') self.remove_pid_file() - sys.stdout = self._default_stdout - sys.stderr = self._default_stderr + if 'intercept-stdout' in self._config and self._config['intercept-stdout']: + sys.stdout = self._default_stdout + sys.stderr = self._default_stderr def exit(self): import sys @@ -264,10 +265,11 @@ class GitAutoDeploy(object): # Set default stdout and stderr to our logging interface (that writes # to file and console depending on user preference) - self._default_stdout = sys.stdout - self._default_stderr = sys.stderr - sys.stdout = LogInterface(logger.info) - sys.stderr = LogInterface(logger.error) + if 'intercept-stdout' in self._config and self._config['intercept-stdout']: + self._default_stdout = sys.stdout + self._default_stderr = sys.stderr + sys.stdout = LogInterface(logger.info) + sys.stderr = LogInterface(logger.error) if 'daemon-mode' in self._config and self._config['daemon-mode']: logger.info('Starting Git Auto Deploy in daemon mode') |