Merge branch 'nightly' into python3

# Conflicts: # plexpy/datafactory.py # plexpy/libraries.py # plexpy/logger.py # plexpy/version.py
2020-03-19 19:40:05 -07:00
parent f63c1c2f7f 6205af1a9a
commit 19d8c1be5a
33 changed files with 443 additions and 231 deletions
--- a/Tautulli.py
+++ b/Tautulli.py
@@ -261,6 +261,8 @@ def main():
                plexpy.shutdown(restart=True)
            elif plexpy.SIGNAL == 'checkout':
                plexpy.shutdown(restart=True, checkout=True)
+            elif plexpy.SIGNAL == 'reset':
+                plexpy.shutdown(restart=True, reset=True)
            else:
                plexpy.shutdown(restart=True, update=True)