Index: squid-tagger.py ================================================================== --- squid-tagger.py +++ squid-tagger.py @@ -195,11 +195,11 @@ # creating interface self._io = io.FileIO(self._fileno, 'w', closefd) # using empty tail self._tail = None # putting file to nonblocking mode - fcntl.fcntl(self._fileno, fcntl.F_SETFL, fcntl.fcntl(self._fileno, fcntl.F_GETFL) | os.O_NONBLOCK) + fcntl.fcntl(self._fileno, fcntl.F_SETFL, fcntl.fcntl(self._fileno, fcntl.F_GETFL) | os.O_NONBLOCK) def __del__(self): # purge queue before deleting if not self.empty(): self.join() @@ -299,11 +299,11 @@ def __init__(self, queue, logger): self._db = tagDB() self._log = logger self._log.info('started') - self._request = re.compile('^([0-9]+)\ (http|ftp):\/\/([-\w.:]+)\/([^ ]*)\ ([0-9.]+)\/(-|[\w\.]+)\ (-|\w+)\ (-|GET|HEAD|POST).*$') + self._request = re.compile('^([0-9]+)\ (http|ftp):\/\/([-\w.:]+)\/([^ ]*)\ ([0-9.:]+)\/(-|[\w\.]+)\ (-|\w+)\ (-|GET|HEAD|POST).*$') self._queue = queue self._stdout = FWritelineQueue(sys.stdout, False) def process(self, id, site, ip_address, url_path, line = None): #self._log.info('trying {}'.format(site))