vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

catch KeyError

Browse source
This commit is contained in:
clowwindy 2015-02-02 16:22:56 +08:00
parent fbf15cb942
commit 0cd261dd10
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shadowsocks/local.py
View file

@ -72,12 +72,12 @@ def main():
daemon.set_user(config.get('user', None)) daemon.set_user(config.get('user', None))
loop.run() loop.run()
except (KeyboardInterrupt, IOError, OSError) as e: except Exception as e:
logging.error(e) logging.error(e)
if config['verbose']: if config['verbose']:
import traceback import traceback
traceback.print_exc() traceback.print_exc()
os._exit(1) sys.exit(1)
if __name__ == '__main__': if __name__ == '__main__':
main() main()

4
shadowsocks/server.py
View file

@ -87,12 +87,12 @@ def main():
daemon.set_user(config.get('user', None)) daemon.set_user(config.get('user', None))
loop.run() loop.run()
except (KeyboardInterrupt, IOError, OSError) as e: except Exception as e:
logging.error(e) logging.error(e)
if config['verbose']: if config['verbose']:
import traceback import traceback
traceback.print_exc() traceback.print_exc()
os._exit(1) sys.exit(1)
if int(config['workers']) > 1: if int(config['workers']) > 1:
if os.name == 'posix': if os.name == 'posix':