浅念
601451f22b
Overlay ~150 upstream items onto our V8.12 base, preserving trade-pro
theme, registry tests, and design docs. Re-applied our patch set
(discovery/env_for/blocks.css/type-mapping/theme_color/frontend entries,
test_theme_pro_v3 mods) — all anchors survived upstream evolution.
New platform enhancement (fixes upgrade-introduced regression):
multilingual.site_locale now honors settings_json.locale, plus
PUT /api/i18n/sites/{id}/locale — standalone English sites get
<html lang='en'> under the V8.15 locale-rewrite pipeline.
compose: adopt V8.21.3 (image 8.21.3-dev.1, /api/ready probes, MySQL/S3
env) with project name pinned to siteforge-v8-10 (data volumes).
Tests: 356 passed / 11 failed — all 11 confirmed pre-existing in
pristine V8.21.3 on this host (10 upstream Windows env + our build test
now green after locale fix). Patch registry updated in plan doc.
Co-Authored-By: Claude Code <noreply@anthropic.com>
40 lines
1.9 KiB
Python
40 lines
1.9 KiB
Python
'''Isolated build subprocess; invoked only by the Worker, never an API handler.'''
|
|
import json
|
|
import sys
|
|
import traceback
|
|
from pathlib import Path
|
|
from . import db, builder
|
|
from fastapi import HTTPException
|
|
|
|
def main():
|
|
job_id=sys.argv[1]
|
|
row=db.one('SELECT site_id,payload_json,kind FROM build_jobs WHERE id=?',(job_id,))
|
|
if not row:raise SystemExit('Job missing')
|
|
out=db.DATA/'job_results';out.mkdir(parents=True,exist_ok=True)
|
|
result_file=out/(job_id+'.json')
|
|
try:
|
|
opts=json.loads(row['payload_json'] or '{}')
|
|
if row['kind']=='wordpress_scan':
|
|
from . import wp_migration_v82
|
|
value=wp_migration_v82.run_scan(row['site_id'],opts['session_id'],job_id)
|
|
if value['state']=='page_limit':raise TimeoutError('超过单次任务的采集页数限制，请重新提交任务')
|
|
elif row['kind']=='api_scan':
|
|
from . import connectors_v84
|
|
value=connectors_v84.run_scan(row['site_id'],opts['source_id'],job_id)
|
|
elif row['kind']=='mysql_scan':
|
|
from . import connectors_v85
|
|
value=connectors_v85.run_scan(row['site_id'],opts['source_id'],job_id)
|
|
elif row['kind'] in ('remote_deploy','remote_rollback'):
|
|
from . import release_api
|
|
value=release_api.run_delivery(row['site_id'],row['kind'],opts,job_id)
|
|
elif row['kind']=='build':
|
|
value=builder.build(row['site_id'],bool(opts.get('mirror_images',False)))
|
|
else:raise ValueError('未知任务类型')
|
|
obj={'ok':True,'result':value}
|
|
except Exception as exc:
|
|
obj={'ok':False,'error':str(exc)[:1200],'retryable':isinstance(exc,(TimeoutError,ConnectionError)) or (isinstance(exc,HTTPException) and exc.status_code in (502,503,504))}
|
|
result_file.write_text(json.dumps(obj,ensure_ascii=False),encoding='utf-8')
|
|
return 0 if obj['ok'] else 1
|
|
|
|
if __name__=='__main__':sys.exit(main())
|