summaryrefslogtreecommitdiffstats
path: root/gitautodeploy/gitautodeploy.py
diff options
context:
space:
mode:
authorOliver Poignant <oliver@poignant.se>2016-05-04 18:23:01 +0200
committerOliver Poignant <oliver@poignant.se>2016-05-04 18:23:01 +0200
commit7c2e8c6c6300dee3618c6ea39150bb1f4d2ecefb (patch)
tree1acda1ddab0156f9f6d770de2a72e8a68e1f674c /gitautodeploy/gitautodeploy.py
parentca8a90d4afcfde47cc618414a5d83c392af4501e (diff)
downloadGit-Auto-Deploy-7c2e8c6c6300dee3618c6ea39150bb1f4d2ecefb.zip
Git-Auto-Deploy-7c2e8c6c6300dee3618c6ea39150bb1f4d2ecefb.tar.gz
Git-Auto-Deploy-7c2e8c6c6300dee3618c6ea39150bb1f4d2ecefb.tar.bz2
Option to disable stdout and stderr interception
Diffstat (limited to 'gitautodeploy/gitautodeploy.py')
-rw-r--r--gitautodeploy/gitautodeploy.py14
1 files changed, 8 insertions, 6 deletions
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')