Commit 578e6452 authored by Arturo Filastò's avatar Arturo Filastò
Browse files

Handle also unhandled exceptions inside of ooni(deckgen|report|resources) 

* Exit with the correct exit status
parent 2c069e13

bin/oonideckgen

+3 −1
Original line number Diff line number Diff line 
#!/usr/bin/env python

import sys

import exceptions



from twisted.internet import defer, reactor
@@ -10,7 +11,8 @@ exitCode = 128 
def failed(failure):

    global exitCode



    r = failure.trap(exceptions.SystemExit)

    r = failure.trap(exceptions.SystemExit,

                     Exception)

    if r != exceptions.SystemExit:

        log.err("Failed to run oonideckgen")

        log.exception(failure)

bin/oonireport

+3 −1
Original line number Diff line number Diff line 
#!/usr/bin/env python

import sys

from twisted.internet import defer, reactor



from ooni.utils import log
@@ -9,7 +10,8 @@ exitCode = 128 
def failed(failure):

    global exitCode



    r = failure.trap(exceptions.SystemExit)

    r = failure.trap(exceptions.SystemExit,

                     Exception)

    if r != exceptions.SystemExit:

        log.err("Failed to run oonideckgen")

        log.exception(failure)

bin/ooniresources

+16 −2
Original line number Diff line number Diff line 
#!/usr/bin/env python

import sys

from twisted.internet import defer, reactor



from ooni.utils import log

from ooni.resources import cli



exitCode = 128

def failed(failure):

    global exitCode



    r = failure.trap(exceptions.SystemExit,

                     Exception)

    if r != exceptions.SystemExit:

        log.err("Failed to run ooniresources")

        log.exception(failure)

        exitCode = 127

    else:

        exitCode = failure.value.code

    reactor.stop()



def done(result):

    global exitCode



    exitCode = 0

    reactor.stop()



def start():
@@ -19,3 +32,4 @@ def start(): 


reactor.callWhenRunning(start)

reactor.run()

sys.exit(exitCode)