aboutsummaryrefslogtreecommitdiff
path: root/rpki/rpkid.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2016-02-19 18:17:04 +0000
committerRob Austein <sra@hactrn.net>2016-02-19 18:17:04 +0000
commitf25d3cc4f67fba3b7130357dbd03c4b617dc705f (patch)
treec9372242ef799e0977e5d57293d4b443fbb9f33c /rpki/rpkid.py
parentcc053158d613c11174c6b8333d8bdda778addc3e (diff)
Add http-client-timeout parameter, default to something more patient
than one would use in an interactive program. svn path=/branches/tk705/; revision=6272
Diffstat (limited to 'rpki/rpkid.py')
-rw-r--r--rpki/rpkid.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/rpki/rpkid.py b/rpki/rpkid.py
index b589705f..fbbb1cfc 100644
--- a/rpki/rpkid.py
+++ b/rpki/rpkid.py
@@ -137,6 +137,8 @@ class main(object):
self.http_server_host = self.cfg.get("server-host", "")
self.http_server_port = self.cfg.getint("server-port")
+ self.http_client_timeout = self.cfg.getint("http-client-timeout", 300)
+
self.use_internal_cron = self.cfg.getboolean("use-internal-cron", True)
self.initial_delay = random.randint(self.cfg.getint("initial-delay-min", 10),
@@ -335,7 +337,9 @@ class main(object):
http_client = tornado.httpclient.AsyncHTTPClient()
with (yield lock.acquire()):
- response = yield http_client.fetch(request)
+ response = yield http_client.fetch(request,
+ connect_timeout = self.http_client_timeout,
+ request_timeout = self.http_client_timeout)
raise tornado.gen.Return(response)