anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add request status to notifier logs

Browse Source
This commit is contained in:
JonnyWong16
2016-04-26 22:17:33 -07:00
parent fd587fe108
commit 3ecc90d21a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/interfaces/default/notification_config.html
View File

@@ -74,7 +74,7 @@ from plexpy import helpers
</form> </form>
<div class="col-md-12" style="margin-top: 10px; padding-top: 10px; border-top: 1px solid #444;"> <div class="col-md-12" style="margin-top: 10px; padding-top: 10px; border-top: 1px solid #444;">
<h4>Test ${agent['name']}</h4> <h4>Test ${agent['name']}</h4>
<p class="help-block">Test if ${agent['name']} notifications are working. See <a href="/logs">logs</a> for troubleshooting.</p> <p class="help-block">Test if ${agent['name']} notifications are working. See <a href="logs">logs</a> for troubleshooting.</p>
% if agent['name'] == 'Scripts': % if agent['name'] == 'Scripts':
<div class="form-group"> <div class="form-group">
<label for="test_script">Script</label> <label for="test_script">Script</label>

14
plexpy/notifiers.py
View File

@@ -637,7 +637,7 @@ class PROWL(object):
logger.info(u"PlexPy Notifiers :: Prowl notification sent.") logger.info(u"PlexPy Notifiers :: Prowl notification sent.")
return True return True
elif request_status == 401: elif request_status == 401:
logger.warn(u"PlexPy Notifiers :: Prowl notification failed: %s" % response.reason) logger.warn(u"PlexPy Notifiers :: Prowl notification failed: [%s] %s" % (request_status, response.reason))
return False return False
else: else:
logger.warn(u"PlexPy Notifiers :: Prowl notification failed.") logger.warn(u"PlexPy Notifiers :: Prowl notification failed.")
@@ -943,7 +943,7 @@ class PUSHBULLET(object):
logger.info(u"PlexPy Notifiers :: PushBullet notification sent.") logger.info(u"PlexPy Notifiers :: PushBullet notification sent.")
return True return True
elif request_status >= 400 and request_status < 500: elif request_status >= 400 and request_status < 500:
logger.warn(u"PlexPy Notifiers :: PushBullet notification failed: %s" % response.reason) logger.warn(u"PlexPy Notifiers :: PushBullet notification failed: [%s] %s" % (request_status, response.reason))
return False return False
else: else:
logger.warn(u"PlexPy Notifiers :: PushBullet notification failed.") logger.warn(u"PlexPy Notifiers :: PushBullet notification failed.")
@@ -1045,7 +1045,7 @@ class PUSHALOT(object):
logger.info(u"PlexPy Notifiers :: Pushalot notification sent.") logger.info(u"PlexPy Notifiers :: Pushalot notification sent.")
return True return True
elif request_status == 410: elif request_status == 410:
logger.warn(u"PlexPy Notifiers :: Pushalot notification failed: %s" % response.reason) logger.warn(u"PlexPy Notifiers :: Pushalot notification failed: [%s] %s" % (request_status, response.reason))
return False return False
else: else:
logger.warn(u"PlexPy Notifiers :: Pushalot notification failed.") logger.warn(u"PlexPy Notifiers :: Pushalot notification failed.")
@@ -1104,7 +1104,7 @@ class PUSHOVER(object):
logger.info(u"PlexPy Notifiers :: Pushover notification sent.") logger.info(u"PlexPy Notifiers :: Pushover notification sent.")
return True return True
elif request_status >= 400 and request_status < 500: elif request_status >= 400 and request_status < 500:
logger.warn(u"PlexPy Notifiers :: Pushover notification failed: %s" % response.reason) logger.warn(u"PlexPy Notifiers :: Pushover notification failed: [%s] %s" % (request_status, response.reason))
return False return False
else: else:
logger.warn(u"PlexPy Notifiers :: Pushover notification failed.") logger.warn(u"PlexPy Notifiers :: Pushover notification failed.")
@@ -1630,7 +1630,7 @@ class IFTTT(object):
logger.info(u"PlexPy Notifiers :: Ifttt notification sent.") logger.info(u"PlexPy Notifiers :: Ifttt notification sent.")
return True return True
elif request_status >= 400 and request_status < 500: elif request_status >= 400 and request_status < 500:
logger.warn(u"PlexPy Notifiers :: Ifttt notification failed: %s" % response.reason) logger.warn(u"PlexPy Notifiers :: Ifttt notification failed: [%s] %s" % (request_status, response.reason))
return False return False
else: else:
logger.warn(u"PlexPy Notifiers :: Ifttt notification failed.") logger.warn(u"PlexPy Notifiers :: Ifttt notification failed.")
@@ -1699,7 +1699,7 @@ class TELEGRAM(object):
logger.info(u"PlexPy Notifiers :: Telegram notification sent.") logger.info(u"PlexPy Notifiers :: Telegram notification sent.")
return True return True
elif request_status >= 400 and request_status < 500: elif request_status >= 400 and request_status < 500:
logger.warn(u"PlexPy Notifiers :: Telegram notification failed: %s" % response.reason) logger.warn(u"PlexPy Notifiers :: Telegram notification failed: [%s] %s" % (request_status, response.reason))
return False return False
else: else:
logger.warn(u"PlexPy Notifiers :: Telegram notification failed.") logger.warn(u"PlexPy Notifiers :: Telegram notification failed.")
@@ -1792,7 +1792,7 @@ class SLACK(object):
logger.info(u"PlexPy Notifiers :: Slack notification sent.") logger.info(u"PlexPy Notifiers :: Slack notification sent.")
return True return True
elif request_status >= 400 and request_status < 500: elif request_status >= 400 and request_status < 500:
logger.warn(u"PlexPy Notifiers :: Slack notification failed: %s" % response.reason) logger.warn(u"PlexPy Notifiers :: Slack notification failed: [%s] %s" % (request_status, response.reason))
return False return False
else: else:
logger.warn(u"PlexPy Notifiers :: Slack notification failed.") logger.warn(u"PlexPy Notifiers :: Slack notification failed.")