ipfs admin

app/core/background/derivative_cache_janitor.py

@@ -7,10 +7,11 @@ from sqlalchemy import select
 from app.core.logger import make_log
 from app.core.storage import db_session
 from app.core.models.content_v3 import ContentDerivative
+from app.core.models._config import ServiceConfig
 
 
-MAX_GB = float(os.getenv('DERIVATIVE_CACHE_MAX_GB', '50'))
-TTL_DAYS = int(os.getenv('DERIVATIVE_CACHE_TTL_DAYS', '30'))
+ENV_MAX_GB = float(os.getenv('DERIVATIVE_CACHE_MAX_GB', '50'))
+ENV_TTL_DAYS = int(os.getenv('DERIVATIVE_CACHE_TTL_DAYS', '0'))
 INTERVAL_SEC = int(os.getenv('DERIVATIVE_JANITOR_INTERVAL_SEC', '600'))
 
 
@@ -22,7 +23,10 @@ async def _current_total_size() -> int:
 
 async def _evict_over_ttl(now: datetime) -> int:
     removed = 0
-    if TTL_DAYS <= 0:
+    # Pull TTL from ServiceConfig each time
+    async with db_session() as session:
+        ttl_days = await ServiceConfig(session).get('DERIVATIVE_CACHE_TTL_DAYS', ENV_TTL_DAYS)
+    if int(ttl_days) <= 0:
         return 0
     async with db_session() as session:
         rows = (await session.execute(select(ContentDerivative).where(ContentDerivative.status == 'ready'))).scalars().all()
@@ -44,7 +48,9 @@ async def _evict_over_ttl(now: datetime) -> int:
 
 
 async def _evict_to_fit():
-    limit_bytes = int(MAX_GB * (1024 ** 3))
+    async with db_session() as session:
+        max_gb = await ServiceConfig(session).get('DERIVATIVE_CACHE_MAX_GB', ENV_MAX_GB)
+    limit_bytes = int(float(max_gb) * (1024 ** 3))
     total = await _current_total_size()
     if total <= limit_bytes:
         return 0

app/core/background/index_scout_v3.py

@@ -14,8 +14,8 @@ from app.core.ipfs_client import pin_add, find_providers, swarm_connect
 
 
 INTERVAL_SEC = 60
-PIN_CONCURRENCY = int(os.getenv('SYNC_MAX_CONCURRENT_PINS', '4'))
-DISK_WATERMARK_PCT = int(os.getenv('SYNC_DISK_LOW_WATERMARK_PCT', '90'))
+ENV_PIN_CONCURRENCY = int(os.getenv('SYNC_MAX_CONCURRENT_PINS', '4'))
+ENV_DISK_WATERMARK_PCT = int(os.getenv('SYNC_DISK_LOW_WATERMARK_PCT', '90'))
 
 
 async def fetch_index(base_url: str, etag: str | None, since: str | None) -> tuple[List[dict], str | None]:
@@ -104,9 +104,16 @@ async def upsert_content(item: dict):
 
 async def main_fn(memory):
     make_log('index_scout_v3', 'Service started', level='info')
-    sem = asyncio.Semaphore(PIN_CONCURRENCY)
+    sem = None
     while True:
         try:
+            # Read runtime config from ServiceConfig (fallback to env)
+            from app.core.models._config import ServiceConfig
+            async with db_session() as session:
+                max_pins = int(await ServiceConfig(session).get('SYNC_MAX_CONCURRENT_PINS', ENV_PIN_CONCURRENCY))
+                disk_pct = int(await ServiceConfig(session).get('SYNC_DISK_LOW_WATERMARK_PCT', ENV_DISK_WATERMARK_PCT))
+            if sem is None or sem._value != max_pins:
+                sem = asyncio.Semaphore(max_pins)
             async with db_session() as session:
                 nodes = (await session.execute(select(KnownNode))).scalars().all()
             for n in nodes:
@@ -140,7 +147,7 @@ async def main_fn(memory):
                     from app.core._config import UPLOADS_DIR
                     du = shutil.disk_usage(UPLOADS_DIR)
                     used_pct = int(100 * (1 - du.free / du.total))
-                    if used_pct >= DISK_WATERMARK_PCT:
+                    if used_pct >= disk_pct:
                         make_log('index_scout_v3', f"Disk watermark reached ({used_pct}%), skipping pins")
                         continue
                 except Exception: