diff options
| author | Rob Austein <sra@hactrn.net> | 2016-02-20 01:55:08 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-02-20 01:55:08 +0000 |
| commit | 2d94f2e729e777cc05ba565fb48df6d057759aab (patch) | |
| tree | 8829fb9f25607697ce6946c6027e3d0086b3f813 /rpki/rpkidb/models.py | |
| parent | cb402fb8ed1cf963182c384eb6649dfc673a7832 (diff) | |
Apparently we have to set the timeout in the HTTPRequest object.
svn path=/branches/tk705/; revision=6275
Diffstat (limited to 'rpki/rpkidb/models.py')
| -rw-r--r-- | rpki/rpkidb/models.py | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/rpki/rpkidb/models.py b/rpki/rpkidb/models.py index 5fd5785f..dab6a847 100644 --- a/rpki/rpkidb/models.py +++ b/rpki/rpkidb/models.py @@ -514,11 +514,13 @@ class Repository(models.Model): for q_pdu in q_msg: logger.info("Sending %r hash = %s uri = %s to pubd", q_pdu, q_pdu.get("hash"), q_pdu.get("uri")) http_request = tornado.httpclient.HTTPRequest( - url = self.peer_contact_uri, - method = "POST", - body = rpki.publication.cms_msg().wrap(q_msg, self.bsc.private_key_id, - self.bsc.signing_cert, self.bsc.signing_cert_crl), - headers = { "Content-Type" : rpki.publication.content_type }) + url = self.peer_contact_uri, + method = "POST", + body = rpki.publication.cms_msg().wrap(q_msg, self.bsc.private_key_id, + self.bsc.signing_cert, self.bsc.signing_cert_crl), + headers = { "Content-Type" : rpki.publication.content_type }, + connect_timeout = rpkid.http_client_timeout, + request_timeout = rpkid.http_client_timeout) http_response = yield rpkid.http_fetch(http_request) if http_response.headers.get("Content-Type") not in rpki.publication.allowed_content_types: raise rpki.exceptions.BadContentType("HTTP Content-Type %r, expected %r" % ( @@ -736,11 +738,13 @@ class Parent(models.Model): if self.bsc.signing_cert is None: raise rpki.exceptions.BSCNotReady("%r is not yet usable" % self.bsc) http_request = tornado.httpclient.HTTPRequest( - url = self.peer_contact_uri, - method = "POST", - body = rpki.up_down.cms_msg().wrap(q_msg, self.bsc.private_key_id, - self.bsc.signing_cert, self.bsc.signing_cert_crl), - headers = { "Content-Type" : rpki.up_down.content_type }) + url = self.peer_contact_uri, + method = "POST", + body = rpki.up_down.cms_msg().wrap(q_msg, self.bsc.private_key_id, + self.bsc.signing_cert, self.bsc.signing_cert_crl), + headers = { "Content-Type" : rpki.up_down.content_type }, + connect_timeout = rpkid.http_client_timeout, + request_timeout = rpkid.http_client_timeout) http_response = yield rpkid.http_fetch(http_request) if http_response.headers.get("Content-Type") not in rpki.up_down.allowed_content_types: raise rpki.exceptions.BadContentType("HTTP Content-Type %r, expected %r" % ( |