pictuga
/
morss
1
1
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Unify internal/external errors

master
pictuga 2014-06-16 13:55:59 +02:00
parent ed4f2b8b98
commit 9285525256
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
morss/morss.py
View File

@ -760,18 +760,13 @@ def cgi_wrapper(environ, start_response):
return cgi_app(environ, start_response) or [] return cgi_app(environ, start_response) or []
except (KeyboardInterrupt, SystemExit): except (KeyboardInterrupt, SystemExit):
raise raise
except MorssException as e:
headers = {}
headers['status'] = '500 Oops'
headers['content-type'] = 'text/plain'
start_response(headers['status'], headers.items(), sys.exc_info())
return 'Internal Error: %s' % e.message
except Exception as e: except Exception as e:
headers = {} headers = {}
headers['status'] = '500 Oops' headers['status'] = '500 Oops'
headers['content-type'] = 'text/plain' headers['content-type'] = 'text/plain'
start_response(headers['status'], headers.items(), sys.exc_info()) start_response(headers['status'], headers.items(), sys.exc_info())
return 'Unknown Error: %s' % e.message log('ERROR: %s' % e.message, force=True)
return 'An error happened'
def cli_app(): def cli_app():
options = Options(sys.argv[1:-1]) options = Options(sys.argv[1:-1])
@ -829,10 +824,8 @@ def main():
cli_app() cli_app()
except (KeyboardInterrupt, SystemExit): except (KeyboardInterrupt, SystemExit):
raise raise
except MorssException as e:
print 'Internal Error: %s' % e.message
except Exception as e: except Exception as e:
print 'Unknown Error: %s' % e.message print 'ERROR: %s' % e.message
if __name__ == '__main__': if __name__ == '__main__':
main() main()