akulij/gongbotrs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #25

Merged
akulij merged 38 commits from dev into main 2025-06-18 17:10:44 +00:00
Conversation 0 Commits 38 Files Changed 19 +7 -8
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 18d6331344 - Show all commits

15
src/bot_manager.rs
View File

@ -70,7 +70,7 @@ where
} }
} }
pub async fn dispatch(mut self, db: &mut DB) -> ! { pub async fn dispatch(mut self, db: &mut DB) -> BotResult<()> {
loop { loop {
'biter: for bi in (self.bi_getter)().await { 'biter: for bi in (self.bi_getter)().await {
// removing handler to force restart // removing handler to force restart
@ -82,7 +82,7 @@ where
"Trying to restart bot `{}`, new script: {}", "Trying to restart bot `{}`, new script: {}",
bi.name, bi.script bi.name, bi.script
); );
let runner = self.bot_pool.remove(&bi.name); let _runner = self.bot_pool.remove(&bi.name);
}; };
// start, if not started // start, if not started
let mut bot_runner = match self.bot_pool.remove(&bi.name) { let mut bot_runner = match self.bot_pool.remove(&bi.name) {
@ -90,7 +90,7 @@ where
None => { None => {
let handlers = (self.h_mapper)(bi.clone()).await; let handlers = (self.h_mapper)(bi.clone()).await;
info!("NEW INSTANCE: Starting new instance! bot name: {}", bi.name); info!("NEW INSTANCE: Starting new instance! bot name: {}", bi.name);
self.start_bot(bi, db, handlers.collect()).await.unwrap(); self.start_bot(bi, db, handlers.collect()).await?;
continue 'biter; continue 'biter;
} }
}; };
@ -125,8 +125,7 @@ where
bot_runner.controller.db.clone(), bot_runner.controller.db.clone(),
handler, handler,
) )
.await .await?,
.unwrap(),
) )
} }
}; };
@ -196,7 +195,7 @@ pub async fn spawn_bot_thread(
// let rt = tokio::runtime::Builder::new_current_thread() // let rt = tokio::runtime::Builder::new_current_thread()
// .enable_all() // .enable_all()
// .build()?; // .build()?;
let rt = tokio::runtime::Runtime::new().unwrap(); let rt = tokio::runtime::Runtime::new()?;
rt.block_on( rt.block_on(
Dispatcher::builder(bot, handler) Dispatcher::builder(bot, handler)
@ -215,11 +214,11 @@ pub async fn spawn_notificator_thread(
mut c: BotController, mut c: BotController,
) -> BotResult<JoinHandle<BotResult<()>>> { ) -> BotResult<JoinHandle<BotResult<()>>> {
let thread = std::thread::spawn(move || -> BotResult<()> { let thread = std::thread::spawn(move || -> BotResult<()> {
let rt = tokio::runtime::Runtime::new().unwrap(); let rt = tokio::runtime::Runtime::new()?;
rt.block_on(async { rt.block_on(async {
loop { loop {
let r = c.runtime.lock().unwrap(); let r = c.runtime.lock().expect("Poisoned Runtime lock");
let notifications = r.rc.get_nearest_notifications(); let notifications = r.rc.get_nearest_notifications();
drop(r); // unlocking mutex drop(r); // unlocking mutex