Drop basically unused queue
This commit is contained in:
parent
812b5fc3b8
commit
8ac85ff627
1 changed files with 4 additions and 15 deletions
19
mp4conv.py
19
mp4conv.py
|
@ -17,10 +17,8 @@ faildir = "upload/fail/"
|
||||||
logf = "[%(name)s] %(levelname)s: %(message)s"
|
logf = "[%(name)s] %(levelname)s: %(message)s"
|
||||||
logging.basicConfig(format=logf)
|
logging.basicConfig(format=logf)
|
||||||
|
|
||||||
globq = multiprocessing.Queue()
|
|
||||||
|
|
||||||
class Worker(multiprocessing.Process):
|
class Worker(multiprocessing.Process):
|
||||||
def __init__(self, path, q):
|
def __init__(self, path):
|
||||||
super(Worker, self).__init__()
|
super(Worker, self).__init__()
|
||||||
|
|
||||||
self.path = path
|
self.path = path
|
||||||
|
@ -31,9 +29,7 @@ class Worker(multiprocessing.Process):
|
||||||
self.string = io.StringIO()
|
self.string = io.StringIO()
|
||||||
self.logger = logging.getLogger("mp4conv")
|
self.logger = logging.getLogger("mp4conv")
|
||||||
self.handler = logging.StreamHandler(self.string)
|
self.handler = logging.StreamHandler(self.string)
|
||||||
self.queue = logging.handlers.QueueHandler(q)
|
|
||||||
self.logger.addHandler(self.handler)
|
self.logger.addHandler(self.handler)
|
||||||
self.logger.addHandler(self.queue)
|
|
||||||
self.logger.setLevel(logging.DEBUG)
|
self.logger.setLevel(logging.DEBUG)
|
||||||
|
|
||||||
def subprocess_logger(self, output):
|
def subprocess_logger(self, output):
|
||||||
|
@ -88,25 +84,18 @@ class Worker(multiprocessing.Process):
|
||||||
self.process()
|
self.process()
|
||||||
|
|
||||||
class Handler(pyinotify.ProcessEvent):
|
class Handler(pyinotify.ProcessEvent):
|
||||||
def my_init(self, q):
|
|
||||||
self.logq = q
|
|
||||||
|
|
||||||
def process_IN_CLOSE_WRITE(self, event):
|
def process_IN_CLOSE_WRITE(self, event):
|
||||||
Worker(event.pathname, self.logq).start()
|
Worker(event.pathname).start()
|
||||||
|
|
||||||
def process_IN_MOVED_TO(self, event):
|
def process_IN_MOVED_TO(self, event):
|
||||||
self.process_IN_CLOSE_WRITE(event)
|
self.process_IN_CLOSE_WRITE(event)
|
||||||
|
|
||||||
|
|
||||||
def runner(q = globq):
|
def runner():
|
||||||
watch = pyinotify.WatchManager()
|
watch = pyinotify.WatchManager()
|
||||||
event = pyinotify.IN_CLOSE_WRITE | pyinotify.IN_MOVED_TO
|
event = pyinotify.IN_CLOSE_WRITE | pyinotify.IN_MOVED_TO
|
||||||
|
|
||||||
#handler = logging.StreamHandler()
|
notifier = pyinotify.ThreadedNotifier(watch, Handler())
|
||||||
#listener = logging.handlers.QueueListener(q, handler)
|
|
||||||
#listener.start()
|
|
||||||
|
|
||||||
notifier = pyinotify.ThreadedNotifier(watch, Handler(q=q))
|
|
||||||
watch.add_watch(indir, event, rec=True)
|
watch.add_watch(indir, event, rec=True)
|
||||||
notifier.start()
|
notifier.start()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue