@@ -10,6 +10,7 @@ import * as Crypto from "effect/Crypto";
1010import * as Deferred from "effect/Deferred" ;
1111import * as Duration from "effect/Duration" ;
1212import * as Effect from "effect/Effect" ;
13+ import * as Result from "effect/Result" ;
1314import * as Exit from "effect/Exit" ;
1415import * as Fiber from "effect/Fiber" ;
1516import * as Layer from "effect/Layer" ;
@@ -482,19 +483,18 @@ export function terminateLinuxCgroupLease(
482483 let lastRemovalFailure : { readonly cause : unknown } | null = null ;
483484 for ( let attempt = 0 ; attempt < 200 ; attempt += 1 ) {
484485 if ( ! lease . exists ( ) ) return ;
485- try {
486- lease . kill ( ) ;
487- } catch ( cause ) {
486+ const killed = yield * Effect . try ( ( ) => lease . kill ( ) ) . pipe ( Effect . result ) ;
487+ if ( Result . isFailure ( killed ) ) {
488+ const cause = killed . failure . cause ;
488489 const code = ( cause as NodeJS . ErrnoException | undefined ) ?. code ;
489490 if ( code !== "ENOENT" ) return yield * failure ( "kill" , cause ) ;
490491 if ( ! lease . exists ( ) ) return ;
491492 yield * Effect . sleep ( "10 millis" ) ;
492493 continue ;
493494 }
494- let populated : boolean ;
495- try {
496- populated = lease . populated ( ) ;
497- } catch ( cause ) {
495+ const populated = yield * Effect . try ( ( ) => lease . populated ( ) ) . pipe ( Effect . result ) ;
496+ if ( Result . isFailure ( populated ) ) {
497+ const cause = populated . failure . cause ;
498498 const code = ( cause as NodeJS . ErrnoException | undefined ) ?. code ;
499499 if ( code === "ENOENT" && ! lease . exists ( ) ) return ;
500500 if ( code === "ENOENT" ) {
@@ -503,21 +503,22 @@ export function terminateLinuxCgroupLease(
503503 }
504504 return yield * failure ( "read state for" , cause ) ;
505505 }
506- if ( populated ) {
506+ if ( populated . success ) {
507507 lastRemovalFailure = null ;
508508 yield * Effect . sleep ( "10 millis" ) ;
509509 continue ;
510510 }
511- try {
512- lease . remove ( ) ;
513- lastRemovalFailure = null ;
514- } catch ( cause ) {
511+ const removed = yield * Effect . try ( ( ) => lease . remove ( ) ) . pipe ( Effect . result ) ;
512+ if ( Result . isFailure ( removed ) ) {
513+ const cause = removed . failure . cause ;
515514 const code = ( cause as NodeJS . ErrnoException | undefined ) ?. code ;
516515 if ( code === "ENOENT" && ! lease . exists ( ) ) return ;
517516 if ( code !== "EBUSY" && code !== "ENOTEMPTY" && code !== "ENOENT" ) {
518517 return yield * failure ( "remove" , cause ) ;
519518 }
520519 lastRemovalFailure = { cause } ;
520+ } else {
521+ lastRemovalFailure = null ;
521522 }
522523 if ( ! lease . exists ( ) ) return ;
523524 yield * Effect . sleep ( "10 millis" ) ;
0 commit comments