mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-07-05 20:51:15 -07:00
Improve timezone fallback
This commit is contained in:
parent
87a77f0522
commit
43b350a1cc
3 changed files with 7 additions and 6 deletions
|
@ -110,12 +110,12 @@ def main():
|
|||
verbose=plexpy.VERBOSE)
|
||||
|
||||
try:
|
||||
plexpy.SYS_TIMEZONE = str(tzlocal.get_localzone())
|
||||
plexpy.SYS_UTC_OFFSET = datetime.datetime.now(pytz.timezone(plexpy.SYS_TIMEZONE)).strftime('%z')
|
||||
plexpy.SYS_TIMEZONE = tzlocal.get_localzone()
|
||||
except (pytz.UnknownTimeZoneError, LookupError, ValueError) as e:
|
||||
logger.error("Could not determine system timezone: %s" % e)
|
||||
plexpy.SYS_TIMEZONE = 'Unknown'
|
||||
plexpy.SYS_UTC_OFFSET = '+0000'
|
||||
plexpy.SYS_TIMEZONE = pytz.UTC
|
||||
|
||||
plexpy.SYS_UTC_OFFSET = datetime.datetime.now(plexpy.SYS_TIMEZONE).strftime('%z')
|
||||
|
||||
if os.getenv('TAUTULLI_DOCKER', False) == 'True':
|
||||
plexpy.DOCKER = True
|
||||
|
|
|
@ -73,7 +73,7 @@ DOCUMENTATION :: END
|
|||
</tr>
|
||||
<tr>
|
||||
<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>
|
||||
<td>Python Version:</td>
|
||||
|
|
|
@ -33,6 +33,7 @@ import cherrypy
|
|||
from apscheduler.schedulers.background import BackgroundScheduler
|
||||
from apscheduler.triggers.interval import IntervalTrigger
|
||||
from UniversalAnalytics import Tracker
|
||||
import pytz
|
||||
|
||||
import activity_handler
|
||||
import activity_pinger
|
||||
|
@ -160,7 +161,7 @@ def initialize(config_file):
|
|||
' - {}'.format(common.PLATFORM_LINUX_DISTRO) if common.PLATFORM_LINUX_DISTRO else ''
|
||||
))
|
||||
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(
|
||||
sys.version
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue