nikdoof/python-ts3
1
0
Fork 0
mirror of https://github.com/nikdoof/python-ts3.git synced 2025-12-16 19:42:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added locking for IO, avoid call collisions on multithreaded applications

Browse Source
This commit is contained in:
Andrew Williams
2011-06-07 09:25:46 +01:00
parent 9ac1fd1d8d
commit 68aafbde35
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ts3/__init__.py
View File

@@ -28,6 +28,7 @@
import time import time
import telnetlib import telnetlib
import logging import logging
from threading import Lock
from defines import * from defines import *
@@ -85,6 +86,8 @@ class TS3Response():
class TS3Proto(): class TS3Proto():
io_lock = Lock()
@property @property
def logger(self): def logger(self):
if not hasattr(self, "_logger"): if not hasattr(self, "_logger"):
@@ -92,6 +95,7 @@ class TS3Proto():
return self._logger return self._logger
def connect(self, ip, port=10011, timeout=5): def connect(self, ip, port=10011, timeout=5):
self.io_lock.acquire()
try: try:
self._telnet = telnetlib.Telnet(ip, port) self._telnet = telnetlib.Telnet(ip, port)
except telnetlib.socket.error: except telnetlib.socket.error:
@@ -101,6 +105,7 @@ class TS3Proto():
self._connected = False self._connected = False
data = self._telnet.read_until("\n\r", self._timeout) data = self._telnet.read_until("\n\r", self._timeout)
self.io_lock.release()
if data.endswith("TS3\n\r"): if data.endswith("TS3\n\r"):
self._connected = True self._connected = True
@@ -120,10 +125,13 @@ class TS3Proto():
commandstr = self.construct_command(command, keys=keys, opts=opts) commandstr = self.construct_command(command, keys=keys, opts=opts)
self.logger.debug("send_command - %s" % commandstr) self.logger.debug("send_command - %s" % commandstr)
self.io_lock.acquire()
self._telnet.write("%s\n\r" % commandstr) self._telnet.write("%s\n\r" % commandstr)
data = "" data = ""
response = self._telnet.read_until("\n\r", self._timeout) response = self._telnet.read_until("\n\r", self._timeout)
self.io_lock.release()
if not response.startswith("error"): if not response.startswith("error"):
# what we just got was extra data # what we just got was extra data