File tree Expand file tree Collapse file tree 3 files changed +13
-2
lines changed
JShellAPI/src/main/java/org/togetherjava/jshellapi/service Expand file tree Collapse file tree 3 files changed +13
-2
lines changed Original file line number Diff line number Diff line change @@ -131,7 +131,13 @@ public void onNext(Frame object) {
131131 }
132132
133133 public void killContainerByName (String name ) {
134- for (Container container : client .listContainersCmd ().withNameFilter (Set .of (name )).exec ()) {
134+ LOGGER .debug ("Fetching container to kill {}." , name );
135+ List <Container > containers = client .listContainersCmd ().withNameFilter (Set .of (name )).exec ();
136+ LOGGER .debug ("Number of containers to kill: {} for name {}." , containers .size (), name );
137+ if (containers .size () != 1 ) {
138+ LOGGER .error ("There is more than 1 container for name {}." , name );
139+ }
140+ for (Container container : containers ) {
135141 client .killContainerCmd (container .getId ()).exec ();
136142 }
137143 }
Original file line number Diff line number Diff line change @@ -206,6 +206,7 @@ public String id() {
206206
207207 @ Override
208208 public void close () {
209+ LOGGER .debug ("Close called for session {}." , id );
209210 try {
210211 dockerService .killContainerByName (containerName ());
211212 try {
Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ public class JShellSessionService {
2828 private void initScheduler () {
2929 scheduler = Executors .newSingleThreadScheduledExecutor ();
3030 scheduler .scheduleAtFixedRate (() -> {
31+ LOGGER .info ("Scheduler heartbeat: started." );
3132 jshellSessions .keySet ()
3233 .stream ()
3334 .filter (id -> jshellSessions .get (id ).isClosed ())
@@ -36,6 +37,7 @@ private void initScheduler() {
3637 .stream ()
3738 .filter (id -> jshellSessions .get (id ).shouldDie ())
3839 .toList ();
40+ LOGGER .info ("Scheduler heartbeat: sessions ready to die: {}" , toDie );
3941 for (String id : toDie ) {
4042 try {
4143 deleteSession (id );
@@ -49,8 +51,10 @@ private void initScheduler() {
4951
5052 void notifyDeath (String id ) {
5153 JShellService shellService = jshellSessions .remove (id );
52- if (shellService == null )
54+ if (shellService == null ) {
55+ LOGGER .debug ("Notify death on already removed session {}." , id );
5356 return ;
57+ }
5458 if (!shellService .isClosed ()) {
5559 LOGGER .error ("JShell Service isn't dead when it should for id {}." , id );
5660 }
You can’t perform that action at this time.
0 commit comments