mirrors/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2025-06-07 01:51:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup settings.py sqlite settings more

Browse source
This commit is contained in:
Nick Sweeting 2024-09-13 03:25:46 -07:00
parent c887af0278
commit 3bbf8f69ab
No known key found for this signature in database
1 changed files with 35 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

49
archivebox/core/settings.py
View file

@ -29,10 +29,16 @@ IS_SHELL = 'shell' in sys.argv[:3] or 'shell_plus' in sys.argv[:3]
BUILTIN_PLUGINS_DIR = CONFIG.PACKAGE_DIR / 'builtin_plugins' # /app/archivebox/builtin_plugins BUILTIN_PLUGINS_DIR = CONFIG.PACKAGE_DIR / 'builtin_plugins' # /app/archivebox/builtin_plugins
USERDATA_PLUGINS_DIR = CONFIG.OUTPUT_DIR / 'user_plugins' # /data/user_plugins USERDATA_PLUGINS_DIR = CONFIG.OUTPUT_DIR / 'user_plugins' # /data/user_plugins
def find_plugins_in_dir(plugins_dir, prefix: str) -> Dict[str, Path]: # PLUGIN_IMPORT_ORDER = ['base', 'pip', 'npm', 'ytdlp']
#
# def get_plugin_order(p: Path) -> str:
# return str(PLUGIN_IMPORT_ORDER.index(p.parent.name)) if p.parent.name in PLUGIN_IMPORT_ORDER else str(p)
def find_plugins_in_dir(plugins_dir: Path, prefix: str) -> Dict[str, Path]:
"""{"builtin_plugins.pip": "/app/archivebox/builtin_plugins/pip", "user_plugins.other": "/data/user_plugins/other",...}"""
return { return {
f'{prefix}.{plugin_entrypoint.parent.name}': plugin_entrypoint.parent f"{prefix}.{plugin_entrypoint.parent.name}": plugin_entrypoint.parent
for plugin_entrypoint in sorted(plugins_dir.glob('*/apps.py')) for plugin_entrypoint in sorted(plugins_dir.glob("*/apps.py")) # key=get_plugin_order # Someday enforcing plugin import order may be required, but right now it's not needed
} }
INSTALLED_PLUGINS = { INSTALLED_PLUGINS = {
@ -44,6 +50,7 @@ INSTALLED_PLUGINS = {
PLUGINS = AttrDict({}) PLUGINS = AttrDict({})
HOOKS = AttrDict({}) HOOKS = AttrDict({})
# Created later by Hook.register(settings) when each Plugin.register(settings) is called
# CONFIGS = AttrDict({}) # CONFIGS = AttrDict({})
# BINPROVIDERS = AttrDict({}) # BINPROVIDERS = AttrDict({})
# BINARIES = AttrDict({}) # BINARIES = AttrDict({})
@ -94,7 +101,8 @@ INSTALLED_APPS = [
'api', # Django-Ninja-based Rest API interfaces, config, APIToken model, etc. 'api', # Django-Ninja-based Rest API interfaces, config, APIToken model, etc.
# ArchiveBox plugins # ArchiveBox plugins
*INSTALLED_PLUGINS.keys(), # all plugin django-apps found in archivebox/builtin_plugins and data/user_plugins *INSTALLED_PLUGINS.keys(), # all plugin django-apps found in archivebox/builtin_plugins and data/user_plugins,
# plugin.register(settings) is called at import of each plugin (in the order they are listed here), then plugin.ready() is called at AppConfig.ready() time
# 3rd-party apps from PyPI that need to be loaded last # 3rd-party apps from PyPI that need to be loaded last
'admin_data_views', # handles rendering some convenient automatic read-only views of data in Django admin 'admin_data_views', # handles rendering some convenient automatic read-only views of data in Django admin
@ -218,10 +226,7 @@ DATABASE_NAME = os.environ.get("ARCHIVEBOX_DATABASE_NAME", str(DATABASE_FILE))
QUEUE_DATABASE_NAME = DATABASE_NAME.replace('index.sqlite3', 'queue.sqlite3') QUEUE_DATABASE_NAME = DATABASE_NAME.replace('index.sqlite3', 'queue.sqlite3')
DATABASES = { SQLITE_CONNECTION_OPTIONS = {
"default": {
"ENGINE": "django.db.backends.sqlite3",
"NAME": DATABASE_NAME,
"TIME_ZONE": CONFIG.TIMEZONE, "TIME_ZONE": CONFIG.TIMEZONE,
"OPTIONS": { "OPTIONS": {
# https://gcollazo.com/optimal-sqlite-settings-for-django/ # https://gcollazo.com/optimal-sqlite-settings-for-django/
@ -238,35 +243,23 @@ DATABASES = {
"PRAGMA cache_size = 2000;" "PRAGMA cache_size = 2000;"
), ),
}, },
}
DATABASES = {
"default": {
"ENGINE": "django.db.backends.sqlite3",
"NAME": DATABASE_NAME,
# DB setup is sometimes modified at runtime by setup_django() in config.py # DB setup is sometimes modified at runtime by setup_django() in config.py
}, },
"queue": { "queue": {
"ENGINE": "django.db.backends.sqlite3", "ENGINE": "django.db.backends.sqlite3",
"NAME": QUEUE_DATABASE_NAME, "NAME": QUEUE_DATABASE_NAME,
"TIME_ZONE": CONFIG.TIMEZONE, **SQLITE_CONNECTION_OPTIONS,
"OPTIONS": {
"timeout": 5,
"check_same_thread": False,
"transaction_mode": "IMMEDIATE",
"init_command": (
"PRAGMA foreign_keys=ON;"
"PRAGMA journal_mode = WAL;"
"PRAGMA synchronous = NORMAL;"
"PRAGMA temp_store = MEMORY;"
"PRAGMA mmap_size = 134217728;"
"PRAGMA journal_size_limit = 67108864;"
"PRAGMA cache_size = 2000;"
),
},
}, },
# 'cache': { # 'cache': {
# 'ENGINE': 'django.db.backends.sqlite3', # 'ENGINE': 'django.db.backends.sqlite3',
# 'NAME': CACHE_DB_PATH, # 'NAME': CACHE_DB_PATH,
# 'OPTIONS': { # **SQLITE_CONNECTION_OPTIONS,
# 'timeout': 60,
# 'check_same_thread': False,
# },
# 'TIME_ZONE': CONFIG.TIMEZONE,
# }, # },
} }
MIGRATION_MODULES = {'signal_webhooks': None} MIGRATION_MODULES = {'signal_webhooks': None}