--- a/pvl/syslog/args.py	Sun Jan 13 00:25:59 2013 +0200
+++ b/pvl/syslog/args.py	Sun Jan 13 01:50:25 2013 +0200
@@ -3,7 +3,7 @@
 from pvl.syslog.parser import SyslogParser
 from pvl.syslog.filter import SyslogFilter
 from pvl.syslog.syslog import SyslogSource
-from pvl.syslog import fifo, tail
+from pvl.syslog import fifo, tail, file
 
 # XXX: use optparse parser.error()?
 import logging; log = logging.getLogger('pvl.syslog.args')
@@ -46,7 +46,8 @@
 
         May log.error/sys.exit
     """
-
+    
+    # XXX: this belongs in pvl.syslog.source
     if options.syslog_fifo :
         # fifo pipe
         source = fifo.Fifo(options.syslog_fifo)
@@ -54,12 +55,12 @@
 
     elif options.syslog_tail :
         # tail file
-        source = tail.TailFile(options.syslog_tail, skip=True)
-        poll = 2.0 # select(float)
+        source = tail.Tail(options.syslog_tail, skip=True)
+        poll = tail.Tail.POLL # select(float)
 
     elif options.syslog_file :
         # read file
-        source = tail.Tail(open(options.syslog_file))
+        source = file.File(open(options.syslog_file))
         poll = False # do not loop, just read up to EOF
 
     elif optional :
@@ -70,7 +71,7 @@
         if sys.stdin.isatty() :
             log.warning("Reading syslog messages from TTY?")
         
-        source = tail.Tail(sys.stdin)
+        source = file.File(sys.stdin)
         poll = False # XXX: tty vs pipe vs file? False -> just block
     
     # options