Browse Source

enforce UTC timezone on server

Nick Sweeting 3 years ago
parent
commit
1fd5830f58
1 changed files with 5 additions and 2 deletions
  1. 5 2
      archivebox/main.py

+ 5 - 2
archivebox/main.py

@@ -74,6 +74,7 @@ from .config import (
     PUID,
     PUID,
     PGID,
     PGID,
     USER,
     USER,
+    TIMEZONE,
     ENFORCE_ATOMIC_WRITES,
     ENFORCE_ATOMIC_WRITES,
     OUTPUT_PERMISSIONS,
     OUTPUT_PERMISSIONS,
     PYTHON_BINARY,
     PYTHON_BINARY,
@@ -209,6 +210,8 @@ def version(quiet: bool=False,
             out_dir: Path=OUTPUT_DIR) -> None:
             out_dir: Path=OUTPUT_DIR) -> None:
     """Print the ArchiveBox version and dependency information"""
     """Print the ArchiveBox version and dependency information"""
 
 
+    from django.conf import settings
+    
     if quiet:
     if quiet:
         print(VERSION)
         print(VERSION)
     else:
     else:
@@ -227,8 +230,8 @@ def version(quiet: bool=False,
             f'IN_DOCKER={IN_DOCKER}',
             f'IN_DOCKER={IN_DOCKER}',
             f'DEBUG={DEBUG}',
             f'DEBUG={DEBUG}',
             f'IS_TTY={IS_TTY}',
             f'IS_TTY={IS_TTY}',
-            f'TZ={os.environ.get("TZ", "UTC")}',
-            f'DB=SQLite v{CONFIG["SQLITE_VERSION"]} ({CONFIG["SQLITE_JOURNAL_MODE"]} {CONFIG["SQLITE_EXTENSIONS"]})',
+            f'TZ={TIMEZONE}',
+            f'DB={settings.DATABASES["default"]["engine"]} (({CONFIG["SQLITE_JOURNAL_MODE"]} {CONFIG["SQLITE_EXTENSIONS"]})',
             f'FS={"atomic" if ENFORCE_ATOMIC_WRITES else "non-atomic"} {PUID}:{PGID} ({OUTPUT_PERMISSIONS})',
             f'FS={"atomic" if ENFORCE_ATOMIC_WRITES else "non-atomic"} {PUID}:{PGID} ({OUTPUT_PERMISSIONS})',
             f'SEARCH_BACKEND_ENGINE={SEARCH_BACKEND_ENGINE}',
             f'SEARCH_BACKEND_ENGINE={SEARCH_BACKEND_ENGINE}',
         )
         )