ndwarshuis
/
pyledriver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up logging in stream

This commit is contained in:
petrucci4prez 2017-05-31 01:22:44 -04:00
parent 17234848ac
commit f07e583a85
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
stream.py
View File

@ -7,6 +7,9 @@ we make the following assumptions here and optimize as such
- will not need EOS (no mp4s) - will not need EOS (no mp4s)
- will not require SIGINT (this entire program won't understand them anyways) - will not require SIGINT (this entire program won't understand them anyways)
- no tags or TOCs - no tags or TOCs
From a logging an error handling standpoint, all 'errors' here are logged as
'critical' which will shut down the entire program and send an email.
""" """
from auxilary import async, waitForPath from auxilary import async, waitForPath
@ -31,21 +34,25 @@ def gstPrintMsg(pName, frmt, *args, level=logging.DEBUG, sName=None):
else: else:
logger.log(level, '[{}] '.format(pName) + frmt.format(*args)) logger.log(level, '[{}] '.format(pName) + frmt.format(*args))
def processErrorMessage(pName, sName, msg, level=logging.DEBUG): def processErrorMessage(pName, sName, msg):
error, debug = msg.parse_error() error, debug = msg.parse_error()
if debug: if debug:
gstPrintMsg(pName, '{} - Additional debug info: {}', error.message, debug, level=level, sName=sName) gstPrintMsg(pName, '{} - Additional debug info: {}', error.message, debug,
level=logging.ERROR, sName=sName)
else: else:
gstPrintMsg(pName, error.message, level=level, sName=sName) gstPrintMsg(pName, error.message, level=logging.ERROR, sName=sName)
raise GstException(error) raise GstException
def linkElements(e1, e2, caps=None): def linkElements(e1, e2, caps=None):
if caps: if caps:
if not e1.link_filtered(e2, caps): if not e1.link_filtered(e2, caps):
raise GstException('cannot link \"{}\" to \"{}\" with caps {}'.format(e1.get_name(), e2.get_name(), caps.to_string())) logger.error('cannot link \"%s\" to \"%s\" with caps %s',
e1.get_name(), e2.get_name(), caps.to_string())
raise SystemExit
else: else:
if not e1.link(e2): if not e1.link(e2):
raise GstException('cannot link \"{}\" to \"{}\"'.format(e1.get_name(), e2.get_name())) logger.error('cannot link \%s\" to \"%s\"', e1.get_name(), e2.get_name())
raise SystemExit
def linkTee(tee, *args): def linkTee(tee, *args):
i = 0 i = 0
@ -114,12 +121,12 @@ def eventLoop(pipeline, block=True, doProgress=False, targetState=Gst.State.PLAY
if debug: if debug:
gstPrintMsg(pName, '{} - Additional debug info: {}', error.message, gstPrintMsg(pName, '{} - Additional debug info: {}', error.message,
debug, level=logging.INFO, sName=msgSrcName) debug, level=logging.WARNING, sName=msgSrcName)
else: else:
gstPrintMsg(pName, error.message, level=logging.INFO, sName=msgSrcName) gstPrintMsg(pName, error.message, level=logging.WARNING, sName=msgSrcName)
elif msgType == Gst.MessageType.ERROR: elif msgType == Gst.MessageType.ERROR:
processErrorMessage(pName, msgSrcName, msg, logging.ERROR) processErrorMessage(pName, msgSrcName, msg)
elif msgType == Gst.MessageType.STATE_CHANGED: elif msgType == Gst.MessageType.STATE_CHANGED:
# we only care about pipeline level state changes # we only care about pipeline level state changes
@ -228,8 +235,7 @@ def startPipeline(pipeline, play=True):
eventLoop(pipeline, block=True, doProgress=True, targetState=Gst.State.PAUSED) eventLoop(pipeline, block=True, doProgress=True, targetState=Gst.State.PAUSED)
except GstException: except GstException:
gstPrintMsg(pName, 'Does not want to preroll', level=logging.ERROR) gstPrintMsg(pName, 'Does not want to preroll', level=logging.ERROR)
# some cleanup here? raise SystemExit
raise
elif stateChange == Gst.StateChangeReturn.SUCCESS: elif stateChange == Gst.StateChangeReturn.SUCCESS:
gstPrintMsg(pName, 'Is prerolled') gstPrintMsg(pName, 'Is prerolled')
@ -238,25 +244,23 @@ def startPipeline(pipeline, play=True):
eventLoop(pipeline, block=False, doProgress=True, targetState=Gst.State.PLAYING) eventLoop(pipeline, block=False, doProgress=True, targetState=Gst.State.PLAYING)
except GstException: except GstException:
gstPrintMsg(pName, 'Does not want to preroll', level=logging.ERROR) gstPrintMsg(pName, 'Does not want to preroll', level=logging.ERROR)
# some cleanup here? raise SystemExit
raise
# ...and end up here # ...and end up here
else: else:
if play: if play:
gstPrintMsg(pName, 'Setting to PLAYING', level=logging.INFO) gstPrintMsg(pName, 'Setting to PLAYING', level=logging.INFO)
# and since this will ALWAYS be successful (maybe)... # ...and since this will ALWAYS be successful...
if pipeline.set_state(Gst.State.PLAYING) == Gst.StateChangeReturn.FAILURE: if pipeline.set_state(Gst.State.PLAYING) == Gst.StateChangeReturn.FAILURE:
gstPrintMsg(pName, 'Cannot set to PLAYING', level=logging.ERROR) gstPrintMsg(pName, 'Cannot set to PLAYING', level=logging.ERROR)
err = pipeline.get_bus().pop_filtered(Gst.MessageType.Error) err = pipeline.get_bus().pop_filtered(Gst.MessageType.Error)
processErrorMessage(pName, msgSrcName, err, logging.ERROR) processErrorMessage(pName, msgSrcName, err)
# ...we and end up here and loop until Tool releases their next album # ...we end up here and loop until Tool releases their next album
try: try:
eventLoop(pipeline, block=True, doProgress=False, targetState=Gst.State.PLAYING) eventLoop(pipeline, block=True, doProgress=False, targetState=Gst.State.PLAYING)
except: except:
# cleanup or recover raise GstException
raise
def initCamera(video=True, audio=True): def initCamera(video=True, audio=True):
pipeline = Gst.Pipeline.new("camera") pipeline = Gst.Pipeline.new("camera")