github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-06 05:01:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve timezone fallback

Browse source
This commit is contained in:
JonnyWong16 2019-05-02 20:00:32 -07:00
parent 87a77f0522
commit 43b350a1cc
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Tautulli.py
View file

@ -110,12 +110,12 @@ def main():
verbose=plexpy.VERBOSE) verbose=plexpy.VERBOSE)
try: try:
plexpy.SYS_TIMEZONE = str(tzlocal.get_localzone()) plexpy.SYS_TIMEZONE = tzlocal.get_localzone()
plexpy.SYS_UTC_OFFSET = datetime.datetime.now(pytz.timezone(plexpy.SYS_TIMEZONE)).strftime('%z')
except (pytz.UnknownTimeZoneError, LookupError, ValueError) as e: except (pytz.UnknownTimeZoneError, LookupError, ValueError) as e:
logger.error("Could not determine system timezone: %s" % e) logger.error("Could not determine system timezone: %s" % e)
plexpy.SYS_TIMEZONE = 'Unknown' plexpy.SYS_TIMEZONE = pytz.UTC
plexpy.SYS_UTC_OFFSET = '+0000'
plexpy.SYS_UTC_OFFSET = datetime.datetime.now(plexpy.SYS_TIMEZONE).strftime('%z')
if os.getenv('TAUTULLI_DOCKER', False) == 'True': if os.getenv('TAUTULLI_DOCKER', False) == 'True':
plexpy.DOCKER = True plexpy.DOCKER = True

2
data/interfaces/default/configuration_table.html
View file

@ -73,7 +73,7 @@ DOCUMENTATION :: END
</tr> </tr>
<tr> <tr>
<td>System Timezone:</td> <td>System Timezone:</td>
<td>${plexpy.SYS_TIMEZONE} (${'UTC{}'.format(plexpy.SYS_UTC_OFFSET)}) <td>${plexpy.SYS_TIMEZONE.zone} (${'UTC{}'.format(plexpy.SYS_UTC_OFFSET)})
</tr> </tr>
<tr> <tr>
<td>Python Version:</td> <td>Python Version:</td>

3
plexpy/__init__.py
View file

@ -33,6 +33,7 @@ import cherrypy
from apscheduler.schedulers.background import BackgroundScheduler from apscheduler.schedulers.background import BackgroundScheduler
from apscheduler.triggers.interval import IntervalTrigger from apscheduler.triggers.interval import IntervalTrigger
from UniversalAnalytics import Tracker from UniversalAnalytics import Tracker
import pytz
import activity_handler import activity_handler
import activity_pinger import activity_pinger
@ -160,7 +161,7 @@ def initialize(config_file):
' - {}'.format(common.PLATFORM_LINUX_DISTRO) if common.PLATFORM_LINUX_DISTRO else '' ' - {}'.format(common.PLATFORM_LINUX_DISTRO) if common.PLATFORM_LINUX_DISTRO else ''
)) ))
logger.info(u"{} (UTC{})".format( logger.info(u"{} (UTC{})".format(
plexpy.SYS_TIMEZONE, plexpy.SYS_UTC_OFFSET plexpy.SYS_TIMEZONE.zone, plexpy.SYS_UTC_OFFSET
)) ))
logger.info(u"Python {}".format( logger.info(u"Python {}".format(
sys.version sys.version