WIP moved templating engine to mycelium

This commit is contained in:
Slatian
2023-10-29 18:43:44 +01:00
parent 5ac056ef99
commit 5adca4fb80
4 changed files with 70 additions and 34 deletions

View File

@ -44,7 +44,6 @@ mod mycelium;
mod ratelimit;
mod settings;
mod simple_dns;
mod templating_engine;
mod view;
use crate::geoip::{
@ -54,11 +53,14 @@ use crate::geoip::{
LocationResult,
};
use crate::idna::IdnaName;
use crate::mycelium::MycEngine;
use crate::simple_dns::DnsLookupResult;
use crate::settings::*;
use crate::view::View;
use crate::ipinfo::{AddressCast,AddressInfo,AddressScope};
type TemplatingEngine = MycEngine<View,QuerySettings,ResponseFormat>;
#[derive(Deserialize, Serialize, Clone)]
pub struct SettingsQuery {
format: Option<ResponseFormat>,
@ -95,7 +97,7 @@ pub struct DigResult {
}
struct ServiceSharedState {
templating_engine: templating_engine::Engine,
templating_engine: TemplatingEngine,
dns_resolvers: HashMap<Arc<str>,TokioAsyncResolver>,
dns_resolver_aliases: HashMap<Arc<str>,Arc<str>>,
asn_db: geoip::MMDBCarrier,
@ -201,10 +203,10 @@ async fn main() {
}
};
let templating_engine = templating_engine::Engine{
tera: tera,
template_config: template_extra_config,
};
let templating_engine = TemplatingEngine::new(
tera,
template_extra_config,
);
// Static file directory