Skip to content

Commit

Permalink
refactor ip2region
Browse files Browse the repository at this point in the history
  • Loading branch information
holmofy committed Dec 3, 2024
1 parent 5227875 commit 5ecd094
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 8 deletions.
12 changes: 12 additions & 0 deletions src/config/ip2region.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
use serde::Deserialize;
use spring::config::Configurable;

#[derive(Clone, Deserialize, Configurable)]
#[config_prefix = "ip2region"]
pub struct Ip2RegionConfig {
pub db_path: String,
}

fn default_db_path() -> String {
"./data/ip2region.xdb".to_string()
}
1 change: 1 addition & 0 deletions src/config/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ pub mod akismet;
pub mod comrak;
pub mod mail;
pub mod auth;
pub mod ip2region;

use serde::Deserialize;
use spring::config::Configurable;
Expand Down
14 changes: 7 additions & 7 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
mod config;
mod views;
mod router;
mod model;
mod plugins;
mod router;
mod service;
mod utils;
mod views;

use plugins::{akismet::AkismetPlugin, uaparser::UAParserPlugin};
use plugins::{akismet::AkismetPlugin, ip2region::Ip2RegionPlugin, uaparser::UAParserPlugin};
use spring::App;
use spring_mail::MailPlugin;
use spring_opentelemetry::{KeyValue, OpenTelemetryPlugin, ResourceConfigurator, SERVICE_NAME, SERVICE_VERSION};
use spring_opentelemetry::{
KeyValue, OpenTelemetryPlugin, ResourceConfigurator, SERVICE_NAME, SERVICE_VERSION,
};
use spring_redis::RedisPlugin;
use spring_sea_orm::SeaOrmPlugin;
use spring_web::{WebConfigurator, WebPlugin};
use xdb::searcher_init;

// Init translations for current crate.
rust_i18n::i18n!("locales");

#[tokio::main]
async fn main() {
let xdb_filepath = "./data/ip2region.xdb";
searcher_init(Some(xdb_filepath.to_owned()));
App::new()
.opentelemetry_attrs([
KeyValue::new(SERVICE_NAME, env!("CARGO_PKG_NAME")),
Expand All @@ -34,6 +33,7 @@ async fn main() {
.add_plugin(RedisPlugin)
.add_plugin(AkismetPlugin)
.add_plugin(UAParserPlugin)
.add_plugin(Ip2RegionPlugin)
.add_router(router::router())
.run()
.await
Expand Down
15 changes: 15 additions & 0 deletions src/plugins/ip2region.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
use crate::config::ip2region::Ip2RegionConfig;
use spring::{app::AppBuilder, async_trait, config::ConfigRegistry, plugin::Plugin};
use xdb::searcher_init;

pub struct Ip2RegionPlugin;

#[async_trait]
impl Plugin for Ip2RegionPlugin {
async fn build(&self, app: &mut AppBuilder) {
let config = app
.get_config::<Ip2RegionConfig>()
.expect("ip2region config is invalid");
searcher_init(Some(config.db_path));
}
}
3 changes: 2 additions & 1 deletion src/plugins/mod.rs
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
pub mod akismet;
pub mod uaparser;
pub mod uaparser;
pub mod ip2region;

0 comments on commit 5ecd094

Please sign in to comment.