github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-11 15:56:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move check for server down to check_active_sessions

Browse source
This commit is contained in:
Jonathan Wong 2015-11-17 06:57:02 -08:00
parent 1c4df69e61
commit c3ea35806e
3 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plexpy/__init__.py
View file

@ -287,8 +287,6 @@ def initialize_scheduler():
hours=12, minutes=0, seconds=0)
schedule_job(activity_pinger.check_recently_added, 'Check for recently added items',
hours=0, minutes=0, seconds=seconds)
schedule_job(activity_pinger.check_server_response, 'Check for server response',
hours=0, minutes=0, seconds=seconds)
# If we're not using websockets then fall back to polling
if not CONFIG.MONITORING_USE_WEBSOCKET or POLLING_FAILOVER:

34
plexpy/activity_pinger.py
View file

@ -163,6 +163,19 @@ def check_active_sessions(ws_request=False):
monitor_process.write_session(session)
else:
logger.debug(u"PlexPy Monitor :: Unable to read session list.")
response = pms_connect.get_server_response()
global ping_count
if not response:
ping_count += 1
logger.warn(u"PlexPy Monitor :: Unable to get a response from the server, ping attempt %s." % str(ping_count))
if ping_count == 3:
# Fire off notifications
threading.Thread(target=notification_handler.notify_timeline,
kwargs=dict(notify_action='down')).start()
else:
ping_count = 0
def check_recently_added():
@ -219,23 +232,4 @@ def check_recently_added():
# Fire off notifications
threading.Thread(target=notification_handler.notify_timeline,
kwargs=dict(timeline_data=item, notify_action='created')).start()
def check_server_response():
with monitor_lock:
pms_connect = pmsconnect.PmsConnect()
response = pms_connect.get_server_response()
global ping_count
if not response:
ping_count += 1
logger.warn(u"PlexPy Monitor :: Unable to get a response from the server, ping attempt %s." % str(ping_count))
if ping_count == 3:
# Fire off notifications
threading.Thread(target=notification_handler.notify_timeline,
kwargs=dict(notify_action='down')).start()
else:
ping_count = 0
kwargs=dict(timeline_data=item, notify_action='created')).start()

2
plexpy/notification_handler.py
View file

@ -179,7 +179,7 @@ def notify_timeline(timeline_data=None, notify_action=None):
body=notify_strings[1])
# Set the notification state in the db
set_notify_state(session=timeline_data, state=notify_action, agent_info=agent)
elif notify_action == 'down':
elif not timeline_data and notify_action:
for agent in notifiers.available_notification_agents():
if agent['on_down'] and notify_action == 'down':
# Build and send notification