@@ -8,7 +8,10 @@ use sqlx::postgres::PgPoolOptions;
88use sqlx:: types:: Uuid ;
99use sqlx:: Error as SqlxError ;
1010use sqlx:: { PgPool , Postgres } ;
11+ use tracing:: warn;
1112use std:: time:: Duration ;
13+ use tracing:: error;
14+ use tracing:: info;
1215
1316use fhevm_engine_common:: types:: SupportedFheOperations ;
1417
@@ -76,8 +79,9 @@ impl Database {
7679 } ;
7780 let mut pool = connect ( ) . await ;
7881 while let Err ( err) = pool {
79- eprintln ! (
80- "Database connection failed. {err}. Will retry indefinitively."
82+ error ! (
83+ error = %err,
84+ "Database connection failed. Will retry indefinitely."
8185 ) ;
8286 tokio:: time:: sleep ( Duration :: from_secs ( 5 ) ) . await ;
8387 pool = connect ( ) . await ;
@@ -107,7 +111,7 @@ impl Database {
107111 match query ( ) . await {
108112 Ok ( tenant_id) => return tenant_id,
109113 Err ( err) if retry_on_sqlx_error ( & err) => {
110- eprintln ! ( "Error requesting tenant id, retrying: {err} " ) ;
114+ error ! ( error = %err , "Error requesting tenant id, retrying" ) ;
111115 tokio:: time:: sleep ( Duration :: from_secs ( 1 ) ) . await ;
112116 }
113117 Err ( SqlxError :: RowNotFound ) => {
@@ -200,9 +204,9 @@ impl Database {
200204 match query ( ) . execute ( & self . pool ) . await {
201205 Ok ( _) => return Ok ( ( ) ) ,
202206 Err ( err) if retry_on_sqlx_error ( & err) => {
203- eprintln ! (
204- " \t Database I/O error: {}, will retry indefinitely" ,
205- err
207+ error ! (
208+ error = %err ,
209+ "Database I/O error, will retry indefinitely"
206210 ) ;
207211 self . reconnect ( ) . await ;
208212 }
@@ -365,9 +369,9 @@ impl Database {
365369 . collect :: < Vec < _ > > ( ) ;
366370
367371 for handle in handles. clone ( ) {
368- println ! (
369- "Allowed for public decryption: {}" ,
370- compact_hex ( & handle ) ,
372+ info ! (
373+ handle = compact_hex ( & handle ) ,
374+ "Allowed for public decryption"
371375 ) ;
372376
373377 self . insert_allowed_handle (
@@ -381,47 +385,56 @@ impl Database {
381385 self . insert_pbs_computations ( & handles) . await ?;
382386 }
383387 AclContractEvents :: Initialized ( initialized) => {
384- println ! ( "unhandled Acl::Initialized event {:?}" , initialized ) ;
388+ warn ! ( event = ?initialized , "unhandled Acl::Initialized event" ) ;
385389 }
386390 AclContractEvents :: NewDelegation ( new_delegation) => {
387- println ! (
388- "unhandled Acl::NewDelegation event {:?}" ,
389- new_delegation
391+ warn ! (
392+ event = ?new_delegation ,
393+ "unhandled Acl::NewDelegation event"
390394 ) ;
391395 }
392396 AclContractEvents :: OwnershipTransferStarted (
393397 ownership_transfer_started,
394398 ) => {
395- println ! (
396- "unhandled Acl::OwnershipTransferStarted event {:?}" ,
397- ownership_transfer_started
399+ warn ! (
400+ event = ?ownership_transfer_started ,
401+ "unhandled Acl::OwnershipTransferStarted event"
398402 ) ;
399403 }
400404 AclContractEvents :: OwnershipTransferred ( ownership_transferred) => {
401- println ! (
402- "unhandled Acl::OwnershipTransferred event {:?}" ,
403- ownership_transferred
405+ warn ! (
406+ event = ?ownership_transferred ,
407+ "unhandled Acl::OwnershipTransferred event"
404408 ) ;
405409 }
406410 AclContractEvents :: RevokedDelegation ( revoked_delegation) => {
407- println ! (
408- "unhandled Acl::RevokedDelegation event {:?}" ,
409- revoked_delegation
411+ warn ! (
412+ event = ?revoked_delegation ,
413+ "unhandled Acl::RevokedDelegation event"
410414 ) ;
411415 }
412416 AclContractEvents :: Upgraded ( upgraded) => {
413- println ! ( "unhandled Acl::Upgraded event {:?}" , upgraded) ;
417+ warn ! (
418+ event = ?upgraded,
419+ "unhandled Acl::Upgraded event"
420+ ) ;
414421 }
415422 AclContractEvents :: Paused ( paused) => {
416- println ! ( "unhandled Acl::Paused event {:?}" , paused) ;
423+ warn ! (
424+ event = ?paused,
425+ "unhandled Acl::Paused event"
426+ ) ;
417427 }
418428 AclContractEvents :: Unpaused ( unpaused) => {
419- println ! ( "unhandled Acl::Unpaused event {:?}" , unpaused) ;
429+ warn ! (
430+ event = ?unpaused,
431+ "unhandled Acl::Unpaused event"
432+ ) ;
420433 }
421434 AclContractEvents :: UpdatePauser ( update_pauser) => {
422- println ! (
423- "unhandled Acl::UpdatePauser event {:?}" ,
424- update_pauser
435+ warn ! (
436+ event = ?update_pauser ,
437+ "unhandled Acl::UpdatePauser event"
425438 ) ;
426439 }
427440 }
@@ -450,10 +463,7 @@ impl Database {
450463 match query ( ) . execute ( & self . pool ) . await {
451464 Ok ( _) => break ,
452465 Err ( err) if retry_on_sqlx_error ( & err) => {
453- eprintln ! (
454- "\t Database I/O error: {}, will retry indefinitely" ,
455- err
456- ) ;
466+ error ! ( error = %err, "Database I/O error, will retry indefinitely" ) ;
457467 self . reconnect ( ) . await ;
458468 }
459469 Err ( sqlx_err) => {
@@ -490,10 +500,7 @@ impl Database {
490500 match query ( ) . execute ( & self . pool ) . await {
491501 Ok ( _) => break ,
492502 Err ( err) if retry_on_sqlx_error ( & err) => {
493- eprintln ! (
494- "\t Database I/O error: {}, will retry indefinitely" ,
495- err
496- ) ;
503+ error ! ( error = %err, "Database I/O error, will retry indefinitely" ) ;
497504 self . reconnect ( ) . await ;
498505 }
499506 Err ( sqlx_err) => {
@@ -533,9 +540,7 @@ fn event_to_op_int(op: &TfheContractEvents) -> FheOperation {
533540 E :: FheNeg ( _) => O :: FheNeg as i32 ,
534541 E :: FheNot ( _) => O :: FheNot as i32 ,
535542 E :: Cast ( _) => O :: FheCast as i32 ,
536- E :: TrivialEncrypt ( _) => {
537- O :: FheTrivialEncrypt as i32
538- }
543+ E :: TrivialEncrypt ( _) => O :: FheTrivialEncrypt as i32 ,
539544 E :: FheIfThenElse ( _) => O :: FheIfThenElse as i32 ,
540545 E :: FheRand ( _) => O :: FheRand as i32 ,
541546 E :: FheRandBounded ( _) => O :: FheRandBounded as i32 ,
0 commit comments