Improved logs and fixed potencial bugs

Author: Alathreon

JShellAPI/src/main/java/org/togetherjava/jshellapi/Main.java

@@ -1,14 +1,18 @@
 package org.togetherjava.jshellapi;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 
 @EnableConfigurationProperties(Config.class)
 @SpringBootApplication
 public class Main {
+    private static final Logger LOGGER = LoggerFactory.getLogger(Main.class);
+
     public static void main(String[] args) {
         SpringApplication.run(Main.class, args);
-        System.out.println("Running");
+        LOGGER.info("Running.");
     }
 }

JShellAPI/src/main/java/org/togetherjava/jshellapi/service/JShellSessionService.java

@@ -27,6 +27,10 @@ public class JShellSessionService {
     private void initScheduler() {
         scheduler = Executors.newSingleThreadScheduledExecutor();
         scheduler.scheduleAtFixedRate(() -> {
+            jshellSessions.keySet()
+                    .stream()
+                    .filter(id -> jshellSessions.get(id).isClosed())
+                    .forEach(this::notifyDeath);
             List<String> toDie = jshellSessions.keySet()
                     .stream()
                     .filter(id -> jshellSessions.get(id).shouldDie())
@@ -41,13 +45,12 @@ private void initScheduler() {
         }, config.schedulerSessionKillScanRateSeconds(), config.schedulerSessionKillScanRateSeconds(), TimeUnit.SECONDS);
     }
     void notifyDeath(String id) {
-        JShellService shellService = jshellSessions.get(id);
+        JShellService shellService = jshellSessions.remove(id);
         if(shellService == null) return;
         if(!shellService.isClosed()) {
-            throw new IllegalStateException("JShell Service isn't dead when it should for id " + id);
+            LOGGER.error("JShell Service isn't dead when it should for id {}.", id);
         }
         LOGGER.info("Session {} died.", id);
-        jshellSessions.remove(id);
     }
 
     public boolean hasSession(String id) {
@@ -56,15 +59,15 @@ public boolean hasSession(String id) {
 
     public JShellService session(String id, @Nullable StartupScriptId startupScriptId) throws DockerException {
         if(!hasSession(id)) {
-            return createSession(new SessionInfo(id, true, startupScriptId, config));
+            return createSession(new SessionInfo(id, true, startupScriptId, false, config));
         }
         return jshellSessions.get(id);
     }
     public JShellService session(@Nullable StartupScriptId startupScriptId) throws DockerException {
-        return createSession(new SessionInfo(UUID.randomUUID().toString(), false, startupScriptId, config));
+        return createSession(new SessionInfo(UUID.randomUUID().toString(), false, startupScriptId, false, config));
     }
     public JShellService oneTimeSession(@Nullable StartupScriptId startupScriptId) throws DockerException {
-        return createSession(new SessionInfo(UUID.randomUUID().toString(), false, startupScriptId, config));
+        return createSession(new SessionInfo(UUID.randomUUID().toString(), false, startupScriptId, true, config));
     }
 
     public void deleteSession(String id) throws DockerException {

JShellAPI/src/main/java/org/togetherjava/jshellapi/service/SessionInfo.java

@@ -4,7 +4,7 @@
 import org.togetherjava.jshellapi.Config;
 
 public record SessionInfo(String id, long sessionTimeout, boolean renewable, long evalTimeout, long evalTimeoutValidationLeeway, int sysOutCharLimit, @Nullable StartupScriptId startupScriptId) {
-    public SessionInfo(String id, boolean renewable, StartupScriptId startupScriptId, Config config) {
-        this(id, config.regularSessionTimeoutSeconds(), renewable, config.evalTimeoutSeconds(), config.evalTimeoutValidationLeeway(), config.sysOutCharLimit(), startupScriptId);
+    public SessionInfo(String id, boolean renewable, StartupScriptId startupScriptId, boolean isOneTime, Config config) {
+        this(id, isOneTime ? config.oneTimeSessionTimeoutSeconds() : config.regularSessionTimeoutSeconds(), renewable, config.evalTimeoutSeconds(), config.evalTimeoutValidationLeeway(), config.sysOutCharLimit(), startupScriptId);
     }
 }