From c2a46c5d6d06e15a654640f0f6c2acb1846c3282 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 18 Feb 2015 10:29:20 -0600 Subject: [PATCH] web2py.py -e --- gluon/restricted.py | 12 +++++++----- gluon/widget.py | 7 +++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gluon/restricted.py b/gluon/restricted.py index de7d8afb..7f1114d1 100644 --- a/gluon/restricted.py +++ b/gluon/restricted.py @@ -1,6 +1,5 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- - """ | This file is part of the web2py Web Framework | Copyrighted by Massimo Di Pierro @@ -20,9 +19,10 @@ import types import os import logging -from storage import Storage -from http import HTTP -from html import BEAUTIFY, XML +from gluon.storage import Storage +from gluon.http import HTTP +from gluon.html import BEAUTIFY, XML +from gluon.settings import global_settings logger = logging.getLogger("web2py") @@ -156,7 +156,6 @@ class RestrictedError(Exception): """ Logs the exception. """ - try: d = { 'layer': str(self.layer), @@ -167,11 +166,14 @@ class RestrictedError(Exception): } ticket_storage = TicketStorage(db=request.tickets_db) ticket_storage.store(request, request.uuid.split('/', 1)[1], d) + if global_settings.cmd_options.print_errors: + logger.error(self.traceback) return request.uuid except: logger.error(self.traceback) return None + def load(self, request, app, ticket_id): """ Loads a logged exception. diff --git a/gluon/widget.py b/gluon/widget.py index 7d1f3903..6c2ef628 100644 --- a/gluon/widget.py +++ b/gluon/widget.py @@ -737,6 +737,13 @@ def console(): default=False, help='disable all output') + parser.add_option('-e', + '--errors_to_console', + action='store_true', + dest='print_errors', + default=False, + help='log all errors to console') + msg = ('set debug output level (0-100, 0 means all, 100 means none; ' 'default is 30)') parser.add_option('-D',