diff options
| author | Rob Austein <sra@hactrn.net> | 2010-10-06 04:13:14 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2010-10-06 04:13:14 +0000 |
| commit | fe3d8174f81370ca80d1d47158959ec3eb9d4eee (patch) | |
| tree | a7f338857cce6dd50ab8534ea831ad46658b53f4 | |
| parent | d1d9fa54994db03fadb82da67ccda1c77e4d4b08 (diff) | |
Don't whine in state closing
svn path=/rpkid.without_tls/rpki/http.py; revision=3463
| -rw-r--r-- | rpkid.without_tls/rpki/http.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rpkid.without_tls/rpki/http.py b/rpkid.without_tls/rpki/http.py index 498df832..aa5f21f5 100644 --- a/rpkid.without_tls/rpki/http.py +++ b/rpkid.without_tls/rpki/http.py @@ -742,11 +742,12 @@ class http_client(http_stream): Connection idle timer has expired. Shut down connection in any case, noisily if we weren't idle. """ - if self.state != "idle": + bad = self.state not in ("idle", "closing") + if bad: self.log("Timeout while in state %s" % self.state, rpki.log.warn) http_stream.handle_timeout(self) self.queue.detach(self) - if self.state not in ("idle", "closing"): + if bad: try: raise rpki.exceptions.HTTPTimeout except rpki.exceptions.HTTPTimeout, e: |