From 6000237c47540016a79071ea2d678a59d89e848a Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Fri, 23 Sep 2016 15:54:31 +0100 Subject: [PATCH] workaround for nasty python/ssl deadlock that has been affecting warcprox, same issue as https://github.com/pyca/cryptography/issues/2911 --- setup.py | 2 +- warcprox/main.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4eeb13d..6eca329 100755 --- a/setup.py +++ b/setup.py @@ -51,7 +51,7 @@ except: setuptools.setup( name='warcprox', - version='2.0b2.dev28', + version='2.0b2.dev29', description='WARC writing MITM HTTP/S proxy', url='https://github.com/internetarchive/warcprox', author='Noah Levitt', diff --git a/warcprox/main.py b/warcprox/main.py index 18a316e..a127016 100644 --- a/warcprox/main.py +++ b/warcprox/main.py @@ -41,6 +41,7 @@ import certauth.certauth import warcprox import re import rethinkstuff +import cryptography.hazmat.backends.openssl def _build_arg_parser(prog=os.path.basename(sys.argv[0])): arg_parser = argparse.ArgumentParser(prog=prog, @@ -213,6 +214,9 @@ def init_controller(args): return controller def real_main(args): + # see https://github.com/pyca/cryptography/issues/2911 + cryptography.hazmat.backends.openssl.backend.activate_builtin_random() + controller = init_controller(args) signal.signal(signal.SIGTERM, lambda a,b: controller.stop.set())