You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/08/07 22:59:34 UTC
[1/2] git commit: Restore full taskd job error details to logging.
Updated Branches:
refs/heads/master cb85a232a -> 2b7892762
Restore full taskd job error details to logging.
This was first "fixed" in de961e2, but then in 8e3c5c3 a better fix
was made so that errormiddleware didn't get applied to tasks, thus
causing the logging to be incomplete.
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/dbffe37a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/dbffe37a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/dbffe37a
Branch: refs/heads/master
Commit: dbffe37a59180be72a58ba31dbd2fcf60a9e1886
Parents: cb85a23
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Wed Aug 7 20:24:49 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Aug 7 20:59:24 2013 +0000
----------------------------------------------------------------------
Allura/allura/model/monq_model.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/dbffe37a/Allura/allura/model/monq_model.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/monq_model.py b/Allura/allura/model/monq_model.py
index d298c1b..9fa0064 100644
--- a/Allura/allura/model/monq_model.py
+++ b/Allura/allura/model/monq_model.py
@@ -257,7 +257,7 @@ class MonQTask(MappedClass):
self.state = 'complete'
return self.result
except Exception, exc:
- log.info('Error on job %r, re-raising it', self)
+ log.exception('Error "%s" on job %s', exc, self)
self.state = 'error'
if hasattr(exc, 'format_error'):
self.result = exc.format_error()
[2/2] git commit: Revert "[#5326] avoid "Broken pipe" error we were
seeing, by providing ErrorMiddleware with an explicit wsgi.errors stream"
Posted by br...@apache.org.
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/master
Commit: 2b78927625073acf3f5463065d0e7e4a5759668d
Parents: dbffe37
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Wed Aug 7 20:29:10 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
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: