--- a/fixbot/fifo.py Thu Feb 04 20:10:34 2010 +0200
+++ b/fixbot/fifo.py Thu Feb 04 20:11:23 2010 +0200
@@ -23,46 +23,35 @@
self.fd = os.open(self.path, os.O_RDONLY | os.O_NONBLOCK)
reactor.addReader(self)
-
- log.msg("opened fifo %s as %d" % (self.path, self.fd))
- def _close (self) :
+ def close (self) :
if self.fd :
reactor.removeReader(self)
os.close(self.fd)
- log.msg("closed fifo %d at %s" % (self.fd, self.path))
-
self.fd = None
- close = _close
def reopen (self) :
"""
Close and re-open the fifo. This is useful for handling EOF
"""
- self._close()
+ self.close()
self._open()
def _read (self, length) :
-# log.msg("(read %d bytes from %d:%s)" % (length, self.fd, self.path))
-
try :
data = os.read(self.fd, length)
except OSError, e :
if e.errno == errno.EAGAIN :
- log.msg("\tEAGAIN")
return None
else :
- log.msg("\tERROR: %s" % e)
raise
if not data :
- log.msg("\tEOF")
raise EOF()
-# log.msg("\tDATA: %d: %r" % (len(data), data))
return data
def fileno (self) :
@@ -70,8 +59,6 @@
def doRead (self) :
while True :
-# log.msg("fifo doRead loop")
-
try :
data = self._read(BUF_SIZE)
except EOF :
@@ -93,7 +80,7 @@
self.close()
def logPrefix (self) :
- return "FIFO:%d:%s" % (self.fd, self.path)
+ return "fifo(%s)" % (self.path, )
def __del__ (self) :
"""