Refactor, create service-assets
This commit is contained in:
@@ -10,7 +10,9 @@ workspace = true
|
||||
[dependencies]
|
||||
toolbox = { workspace = true, features = ["cli", "loki"] }
|
||||
libservice = { workspace = true }
|
||||
|
||||
service-webpage = { workspace = true }
|
||||
service-assets = { workspace = true }
|
||||
|
||||
tracing = { workspace = true }
|
||||
tokio = { workspace = true }
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
use anyhow::{Context, Result};
|
||||
use libservice::{Service, ServiceConnectInfo, ToService};
|
||||
use service_assets::AssetService;
|
||||
use service_webpage::WebpageService;
|
||||
use std::sync::Arc;
|
||||
use tracing::{error, info};
|
||||
@@ -70,6 +71,11 @@ pub struct RouterState {}
|
||||
/// If state is none, dry-init
|
||||
pub async fn make_service(_state: Option<Arc<RouterState>>) -> Result<impl ToService> {
|
||||
let service_webpage = WebpageService::new();
|
||||
let service_assets = AssetService::new();
|
||||
|
||||
Ok(Service::new().merge(service_webpage).to_service().trace())
|
||||
Ok(Service::new()
|
||||
.merge(service_webpage)
|
||||
.nest("/assets", service_assets)
|
||||
.to_service()
|
||||
.trace())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user