From 4185e7aa31d7bceb8ea269f8953574c585d74427 Mon Sep 17 00:00:00 2001 From: azw Date: Sat, 11 Nov 2023 08:43:20 +0000 Subject: [PATCH] 1 --- server/stat/src/app.rs | 2 ++ server/stat/src/app/user_app.rs | 25 +++++++++++++++++++++++-- server/stat/src/main.rs | 2 +- third_party/librust | 2 +- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/server/stat/src/app.rs b/server/stat/src/app.rs index 13619b2..a82092d 100644 --- a/server/stat/src/app.rs +++ b/server/stat/src/app.rs @@ -1 +1,3 @@ pub mod user_app; + +pub use user_app::UserApp; diff --git a/server/stat/src/app/user_app.rs b/server/stat/src/app/user_app.rs index ed98001..db55c97 100644 --- a/server/stat/src/app/user_app.rs +++ b/server/stat/src/app/user_app.rs @@ -3,6 +3,8 @@ use std::cell::RefCell; use r9_macro::SharedFromSelf; use r9_macro_derive::SharedFromSelf; use r9_macro_derive::Singleton; +use f9::app::App; +use f9::app::HttpContext; #[derive(SharedFromSelf)] #[derive(Singleton)] @@ -13,11 +15,26 @@ pub struct UserApp { impl f9::app::UserApp for UserApp { fn get_pkg_name(&self) -> String { - return "".to_string(); + return "statserver".to_string(); } fn init(&mut self) { - + App::instance().borrow_mut().add_http_handler( + "Ops$selfChecking".to_string(), + Box::new( + move |ctx: &mut HttpContext| { + ctx.rsp = "Ops$selfChecking".to_string(); + } + ), + ); + App::instance().borrow_mut().add_http_handler( + "Ops$selfChecking1".to_string(), + Box::new( + move |ctx: &mut HttpContext| { + ctx.rsp = "Ops$selfChecking1".to_string(); + } + ), + ); } fn update(&mut self) { @@ -28,6 +45,10 @@ impl f9::app::UserApp for UserApp { } + fn get_http_listen_port(&self) -> i32 { + return 8080; + } + } impl UserApp { diff --git a/server/stat/src/main.rs b/server/stat/src/main.rs index 82b73e3..e037cfa 100755 --- a/server/stat/src/main.rs +++ b/server/stat/src/main.rs @@ -1,7 +1,7 @@ use f9::app::App; mod app; -use crate::app::user_app::UserApp; +use crate::app::UserApp; fn main() { App::instance().borrow_mut().init(UserApp::instance()); diff --git a/third_party/librust b/third_party/librust index d371216..0e4b8da 160000 --- a/third_party/librust +++ b/third_party/librust @@ -1 +1 @@ -Subproject commit d371216ec4d299af7f7aa68d033941f8006328a1 +Subproject commit 0e4b8daa3498ac0e75475b05f36d2a363098ca81