@@ -13,11 +13,12 @@ extern crate chrono;
1313extern crate serde;
1414extern crate serde_json;
1515
16- use std:: error:: Error ;
17- use std:: path:: PathBuf ;
18-
1916use chrono:: { DateTime , Utc } ;
2017use clap:: { Parser , Subcommand } ;
18+ use std:: error:: Error ;
19+ use std:: path:: PathBuf ;
20+ use std:: sync:: mpsc:: { channel, RecvTimeoutError } ;
21+ use std:: time:: Duration ;
2122
2223use aw_client_rust:: blocking:: AwClient ;
2324
@@ -207,6 +208,12 @@ fn main() -> Result<(), Box<dyn Error>> {
207208}
208209
209210fn daemon ( client : & AwClient ) -> Result < ( ) , Box < dyn Error > > {
211+ let ( tx, rx) = channel ( ) ;
212+
213+ ctrlc:: set_handler ( move || {
214+ let _ = tx. send ( ( ) ) ;
215+ } ) ?;
216+
210217 loop {
211218 if let Err ( e) = daemon_sync_cycle ( client) {
212219 error ! ( "Error during sync cycle: {}" , e) ;
@@ -215,8 +222,20 @@ fn daemon(client: &AwClient) -> Result<(), Box<dyn Error>> {
215222 }
216223
217224 info ! ( "Sync pass done, sleeping for 5 minutes" ) ;
218- std:: thread:: sleep ( std:: time:: Duration :: from_secs ( 300 ) ) ;
225+
226+ // Wait for either the sleep duration or a termination signal
227+ match rx. recv_timeout ( Duration :: from_secs ( 300 ) ) {
228+ Ok ( _) | Err ( RecvTimeoutError :: Disconnected ) => {
229+ info ! ( "Termination signal received, shutting down." ) ;
230+ break ;
231+ }
232+ Err ( RecvTimeoutError :: Timeout ) => {
233+ // Continue the loop if the timeout occurs
234+ }
235+ }
219236 }
237+
238+ Ok ( ( ) )
220239}
221240
222241fn daemon_sync_cycle ( client : & AwClient ) -> Result < ( ) , Box < dyn Error > > {
0 commit comments