update
This commit is contained in:
36
src/main.rs
36
src/main.rs
@@ -67,9 +67,9 @@ async fn main() -> std::io::Result<()> {
|
||||
// ② 全量解析 + 人物合并
|
||||
info!("[启动管线] ② 全量解析 + 人物合并...");
|
||||
let result = engine::pipeline::run_pipeline(&boot_db).await;
|
||||
info!("[启动管线] 完成:清洗标点{},检测人名标签{},脏集{}相册,删除非人物{},发现新相册{},更新人名{},更新标签{},合并人物{},迁移别名{},后移除人名标签{}",
|
||||
info!("[启动管线] 完成:清洗标点{},检测人名标签{},脏集{}相册,删除非人物{},清除停用词重叠人物{},发现新相册{},更新人名{},更新标签{},合并人物{},迁移别名{},后移除人名标签{}",
|
||||
result.tags_cleaned, result.person_like_tags_removed, result.dirty_albums_detected,
|
||||
result.non_persons_deleted, result.new_albums_found,
|
||||
result.non_persons_deleted, result.stop_word_persons_removed, result.new_albums_found,
|
||||
result.persons_updated, result.tags_updated,
|
||||
result.persons_merged, result.aliases_moved, result.tags_removed_person);
|
||||
|
||||
@@ -90,9 +90,9 @@ async fn main() -> std::io::Result<()> {
|
||||
// ① 全量解析 + 人物合并(不重复 import)
|
||||
info!("[定时管线] ① 全量解析 + 人物合并...");
|
||||
let result = engine::pipeline::run_pipeline(&timer_db).await;
|
||||
info!("[定时管线] 完成:清洗标点{},检测人名标签{},脏集{}相册,删除非人物{},发现新相册{},更新人名{},更新标签{},合并人物{},迁移别名{},后移除人名标签{}",
|
||||
info!("[定时管线] 完成:清洗标点{},检测人名标签{},脏集{}相册,删除非人物{},清除停用词重叠人物{},发现新相册{},更新人名{},更新标签{},合并人物{},迁移别名{},后移除人名标签{}",
|
||||
result.tags_cleaned, result.person_like_tags_removed, result.dirty_albums_detected,
|
||||
result.non_persons_deleted, result.new_albums_found,
|
||||
result.non_persons_deleted, result.stop_word_persons_removed, result.new_albums_found,
|
||||
result.persons_updated, result.tags_updated,
|
||||
result.persons_merged, result.aliases_moved, result.tags_removed_person);
|
||||
|
||||
@@ -137,11 +137,16 @@ async fn main() -> std::io::Result<()> {
|
||||
println!(" - GET /api/migration/stats - 迁移状态");
|
||||
println!(" - POST /api/migration/run?path=persons.db - 执行迁移");
|
||||
println!(" - GET /api/queue/stats - 队列状态");
|
||||
println!("词典管理:");
|
||||
println!(" - GET /api/dict/stats - 词典状态");
|
||||
println!(" - POST /api/dict/reload - 热重载词典");
|
||||
println!("按 Ctrl+C 停止服务");
|
||||
|
||||
fs::create_dir_all(&config.storage.images_dir).unwrap_or(());
|
||||
|
||||
HttpServer::new(move || {
|
||||
// 在 move 闭包之前 clone 一份 db 用于关闭信号处理
|
||||
let shutdown_db = Arc::clone(&db);
|
||||
let server = HttpServer::new(move || {
|
||||
App::new()
|
||||
.wrap(middleware::Compress::default())
|
||||
.wrap(middleware::Logger::default())
|
||||
@@ -183,6 +188,9 @@ async fn main() -> std::io::Result<()> {
|
||||
.route("/api/pipeline/run", web::post().to(routes::pipeline_run))
|
||||
// 队列 API
|
||||
.route("/api/queue/stats", web::get().to(routes::get_queue_stats))
|
||||
// 词典 API
|
||||
.route("/api/dict/stats", web::get().to(routes::dict_stats))
|
||||
.route("/api/dict/reload", web::post().to(routes::dict_reload))
|
||||
// 静态文件
|
||||
.service(
|
||||
afs::Files::new("/assets", "./assets")
|
||||
@@ -209,8 +217,22 @@ async fn main() -> std::io::Result<()> {
|
||||
}))
|
||||
})
|
||||
.bind(config.server_address())?
|
||||
.run()
|
||||
.await
|
||||
.run();
|
||||
|
||||
// ── 信号监听:捕获 Ctrl+C / SIGINT,优雅关闭 ──
|
||||
let server_handle = server.handle();
|
||||
tokio::spawn(async move {
|
||||
tokio::signal::ctrl_c().await.expect("监听关闭信号失败");
|
||||
println!("\n[关闭] 收到关闭信号,正在优雅停止服务器...");
|
||||
// 停止接受新请求,等待正在处理中的请求完成(最多 10s)
|
||||
server_handle.stop(true).await;
|
||||
// 服务器已停止 → 合并 WAL
|
||||
println!("[关闭] 服务已停止,正在合并数据库 WAL...");
|
||||
shutdown_db.wal_checkpoint().await;
|
||||
println!("[关闭] 数据库文件已合并,再见!");
|
||||
});
|
||||
|
||||
server.await
|
||||
}
|
||||
|
||||
/// 从 DB 重新加载相册数据到内存缓存
|
||||
|
||||
Reference in New Issue
Block a user