partial cleanup of zeronet.py

This commit is contained in:
Matthew Bell 2015-06-17 22:31:38 +01:00
parent adcee874db
commit d45e162e7f

View file

@ -1,15 +1,24 @@
#!/usr/bin/env python #!/usr/bin/env python
# Included modules
import os
import gc
import sys
import traceback
# ZeroNet Modules
import update
def main(): def main():
print "- Starting ZeroNet..." print "- Starting ZeroNet..."
import sys, os
main = None main = None
try: try:
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) # Imports relative to src sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) # Imports relative to src
import main import main
main.start() main.start()
if main.update_after_shutdown: # Updater if main.update_after_shutdown: # Updater
import update, sys, os, gc
# Try cleanup openssl # Try cleanup openssl
try: try:
if "lib.opensslVerify" in sys.modules: if "lib.opensslVerify" in sys.modules:
@ -28,8 +37,7 @@ def main():
handler.close() handler.close()
logger.removeHandler(handler) logger.removeHandler(handler)
except Exception, err: # Prevent closing except (Exception, ): # Prevent closing
import traceback
traceback.print_exc() traceback.print_exc()
traceback.print_exc(file=open("log/error.log", "a")) traceback.print_exc(file=open("log/error.log", "a"))
@ -46,4 +54,3 @@ def main():
if __name__ == '__main__': if __name__ == '__main__':
main() main()