Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-using threads instead of processes.

This commit is contained in:
martin 2011-07-15 19:49:35 -04:00
parent cc8ec59f89
commit 187d3a5e92
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
python_apps/media-monitor/MediaMonitor.py
View File

@ -10,6 +10,8 @@ from api_clients import api_client
from multiprocessing import Process, Queue as mpQueue from multiprocessing import Process, Queue as mpQueue
from threading import Thread
from pyinotify import WatchManager from pyinotify import WatchManager
from airtimefilemonitor.airtimenotifier import AirtimeNotifier from airtimefilemonitor.airtimenotifier import AirtimeNotifier
@ -20,15 +22,15 @@ from airtimefilemonitor.workerprocess import MediaMonitorWorkerProcess
from airtimefilemonitor.airtimemediamonitorbootstrap import AirtimeMediaMonitorBootstrap from airtimefilemonitor.airtimemediamonitorbootstrap import AirtimeMediaMonitorBootstrap
def handleSigTERM(signum, frame): def handleSigTERM(signum, frame):
"""
logger = logging.getLogger() logger = logging.getLogger()
logger.info("Main Process Shutdown, TERM signal caught.") logger.info("Main Process Shutdown, TERM signal caught.")
for p in processes: for p in processes:
logger.info("Killed process. %d", p.pid) logger.info("Killed process. %d", p.pid)
p.terminate() p.terminate()
"""
sys.exit(0) sys.exit(0)
# configure logging # configure logging
try: try:
logging.config.fileConfig("logging.cfg") logging.config.fileConfig("logging.cfg")
@ -37,7 +39,7 @@ except Exception, e:
sys.exit(1) sys.exit(1)
logger = logging.getLogger() logger = logging.getLogger()
processes = [] #processes = []
try: try:
config = AirtimeMediaConfig(logger) config = AirtimeMediaConfig(logger)
@ -77,9 +79,9 @@ try:
#create 5 worker processes #create 5 worker processes
wp = MediaMonitorWorkerProcess() wp = MediaMonitorWorkerProcess()
for i in range(5): for i in range(5):
p = Process(target=wp.process_file_events, args=(multi_queue, notifier)) t = Thread(target=wp.process_file_events, args=(multi_queue, notifier))
processes.append(p) #processes.append(p)
p.start() t.start()
wdd = notifier.watch_directory(storage_directory) wdd = notifier.watch_directory(storage_directory)
logger.info("Added watch to %s", storage_directory) logger.info("Added watch to %s", storage_directory)