diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 797606dd..f7d67641 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -705,24 +705,6 @@
-
-

Monitoring Settings

-
- -
- -
-
- -
- -
-

- The interval (in seconds) PlexPy will ping your Plex Server. Minimum 30 seconds, recommended 60 seconds.
- Note: Only used for checking Plex remote access. -

-
-

History Logging

diff --git a/plexpy/__init__.py b/plexpy/__init__.py index 4f261142..857c1f0c 100644 --- a/plexpy/__init__.py +++ b/plexpy/__init__.py @@ -315,9 +315,6 @@ def initialize_scheduler(): hours=backup_hours, minutes=0, seconds=0, args=(True, True)) if WS_CONNECTED and CONFIG.PMS_IP and CONFIG.PMS_TOKEN: - # Our interval should never be less than 30 seconds - monitor_seconds = CONFIG.MONITORING_INTERVAL if CONFIG.MONITORING_INTERVAL >= 30 else 30 - #schedule_job(activity_pinger.check_active_sessions, 'Check for active sessions', # hours=0, minutes=0, seconds=1) #schedule_job(activity_pinger.check_recently_added, 'Check for recently added items', @@ -328,7 +325,7 @@ def initialize_scheduler(): hours=12, minutes=0, seconds=0) schedule_job(activity_pinger.check_server_access, 'Check for Plex remote access', - hours=0, minutes=0, seconds=monitor_seconds * bool(CONFIG.MONITOR_REMOTE_ACCESS)) + hours=0, minutes=0, seconds=60 * bool(CONFIG.MONITOR_REMOTE_ACCESS)) schedule_job(activity_pinger.check_server_updates, 'Check for Plex updates', hours=12 * bool(CONFIG.MONITOR_PMS_UPDATES), minutes=0, seconds=0) diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 56bc6365..5ded9229 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -2634,7 +2634,6 @@ class WebInterface(object): "grouping_charts": checked(plexpy.CONFIG.GROUPING_CHARTS), "monitor_pms_updates": checked(plexpy.CONFIG.MONITOR_PMS_UPDATES), "monitor_remote_access": checked(plexpy.CONFIG.MONITOR_REMOTE_ACCESS), - "monitoring_interval": plexpy.CONFIG.MONITORING_INTERVAL, "refresh_libraries_interval": plexpy.CONFIG.REFRESH_LIBRARIES_INTERVAL, "refresh_libraries_on_startup": checked(plexpy.CONFIG.REFRESH_LIBRARIES_ON_STARTUP), "refresh_users_interval": plexpy.CONFIG.REFRESH_USERS_INTERVAL, @@ -2729,7 +2728,6 @@ class WebInterface(object): # If we change any monitoring settings, make sure we reschedule tasks. if kwargs.get('check_github') != plexpy.CONFIG.CHECK_GITHUB or \ - kwargs.get('monitoring_interval') != str(plexpy.CONFIG.MONITORING_INTERVAL) or \ kwargs.get('refresh_libraries_interval') != str(plexpy.CONFIG.REFRESH_LIBRARIES_INTERVAL) or \ kwargs.get('refresh_users_interval') != str(plexpy.CONFIG.REFRESH_USERS_INTERVAL) or \ kwargs.get('monitor_pms_updates') != plexpy.CONFIG.MONITOR_PMS_UPDATES or \