Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DC6BB104FB for ; Mon, 12 Aug 2013 16:41:11 +0000 (UTC) Received: (qmail 52254 invoked by uid 500); 12 Aug 2013 16:40:57 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 51960 invoked by uid 500); 12 Aug 2013 16:40:51 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 51014 invoked by uid 99); 12 Aug 2013 16:40:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Aug 2013 16:40:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 287938BCB1E; Mon, 12 Aug 2013 16:40:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: johnsca@apache.org To: allura-commits@incubator.apache.org Date: Mon, 12 Aug 2013 16:41:28 -0000 Message-Id: <11ba5adfc71b41f28f0ce13ba8cfca8c@git.apache.org> In-Reply-To: <9c559e9207e04ab18111ca1aec19f967@git.apache.org> References: <9c559e9207e04ab18111ca1aec19f967@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [43/50] git commit: Revert "[#5326] avoid "Broken pipe" error we were seeing, by providing ErrorMiddleware with an explicit wsgi.errors stream" Revert "[#5326] avoid "Broken pipe" error we were seeing, by providing ErrorMiddleware with an explicit wsgi.errors stream" Taskd doesn't use errormiddleware since 8e3c5c3 This reverts commit 7eb795608877f0b358aa5234b08dcaccabdee0f8. Conflicts: Allura/allura/command/taskd.py Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/2b789276 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/2b789276 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/2b789276 Branch: refs/heads/cj/6422 Commit: 2b78927625073acf3f5463065d0e7e4a5759668d Parents: dbffe37 Author: Dave Brondsema Authored: Wed Aug 7 20:29:10 2013 +0000 Committer: Dave Brondsema Committed: Wed Aug 7 20:59:25 2013 +0000 ---------------------------------------------------------------------- Allura/allura/command/taskd.py | 8 -------- 1 file changed, 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/2b789276/Allura/allura/command/taskd.py ---------------------------------------------------------------------- diff --git a/Allura/allura/command/taskd.py b/Allura/allura/command/taskd.py index 75d5fcd..50402f0 100644 --- a/Allura/allura/command/taskd.py +++ b/Allura/allura/command/taskd.py @@ -98,11 +98,6 @@ class TaskdCommand(base.Command): if only: only = only.split(',') - # errors get logged via regular logging and also recorded into the mongo task record - # so this is generally not needed, and only present to avoid errors within - # weberror's ErrorMiddleware if the default error stream (stderr?) doesn't work - wsgi_error_log = open(pylons.config.get('taskd.wsgi_log', '/dev/null'), 'a') - def start_response(status, headers, exc_info=None): pass @@ -143,7 +138,6 @@ class TaskdCommand(base.Command): # Build the (fake) request r = Request.blank('/--%s--/%s/' % (self.task.task_name, self.task._id), {'task': self.task, - 'wsgi.errors': wsgi_error_log, # ErrorMiddleware records error details here }) list(wsgi_app(r.environ, start_response)) self.task = None @@ -153,8 +147,6 @@ class TaskdCommand(base.Command): time.sleep(10) else: base.log.exception('taskd error %s' % e) - finally: - wsgi_error_log.flush() base.log.info('taskd pid %s stopping gracefully.' % os.getpid()) if self.restart_when_done: