Commit12bdf9f

committed

abort connection on request timeout

1 parente218ea1 commit12bdf9fCopy full SHA for 12bdf9f

File tree

-7

lines changed

-7

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`setup(`
`4`	`4`	`name='uhf_reader',`
`5`		`-version='0.2.6',`
	`5`	`+version='0.2.7',`
`6`	`6`	`packages=['uhf_reader'],`
`7`	`7`	`url='https://github.com/madprogrammer/mr6100-python',`
`8`	`8`	`license='MIT',`

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,8 @@`
`7`	`7`	`fromuhf_reader.exceptionsimportRequestTimeoutException`
`8`	`8`
`9`	`9`
`10`		`-classUHFReaderProtocolBase(Protocol):`
	`10`	`+classUHFReaderProtocolBase(Protocol,TimeoutMixin):`
`11`	`11`	`request=None`
`12`		`-timeout_id=None`
`13`	`12`	`peer_id=None`
`14`	`13`	`queue=None`
`15`	`14`
`@@ -25,8 +24,7 @@ def dataReceived(self, data):`
`25`	`24`	`ifself.requestandself.request.deferred:`
`26`	`25`	`self.request.deferred.errback(exc)`
`27`	`26`	`finally:`
`28`		`-ifself.timeout_id:`
`29`		`-self.timeout_id.cancel()`
	`27`	`+self.setTimeout(None)`
`30`	`28`
`31`	`29`	`self.checkQueue()`
`32`	`30`
`@@ -37,14 +35,14 @@ def connectionMade(self):`
`37`	`35`	`self.checkQueue()`
`38`	`36`
`39`	`37`	`deftimeoutConnection(self):`
	`38`	`+self.timeoutRequest()`
`40`	`39`	`self.transport.abortConnection()`
`41`	`40`
`42`	`41`	`deftimeoutRequest(self):`
`43`	`42`	`ifself.request:`
`44`	`43`	`self.factory.logger.error("Request %s timed out",self.request)`
`45`	`44`	`ifself.request.deferred:`
`46`	`45`	`self.request.deferred.errback(RequestTimeoutException(self.request))`
`47`		`-self.checkQueue()`
`48`	`46`
`49`	`47`	`defcheckQueue(self):`
`50`	`48`	`ifnotself.queue:`
`@@ -56,7 +54,7 @@ def checkQueue(self):`
`56`	`54`	`self.factory.logger.debug("Sent request: %s",item)`
`57`	`55`
`58`	`56`	`ifself.factory.timeout:`
`59`		`-self.timeout_id=reactor.callLater(self.factory.timeout,self.timeoutRequest)`
	`57`	`+self.setTimeout(self.factory.timeout)`
`60`	`58`
`61`	`59`	`self.request=item`
`62`	`60`	`exceptqueue.Empty:`

Comments

(0)