JShellAPI updated with the new sysout char limit config

Author: Alathreon

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

@@ -7,6 +7,7 @@ public record Config(
         long regularSessionTimeoutSeconds,
         long oneTimeSessionTimeoutSeconds,
         long evalTimeoutSeconds,
+        int sysOutCharLimit,
         long maxAliveSessions,
         int dockerMaxRamMegaBytes,
         double dockerCPUsUsage,
@@ -15,6 +16,7 @@ public record Config(
         if(regularSessionTimeoutSeconds <= 0) throw new RuntimeException("Invalid value " + regularSessionTimeoutSeconds);
         if(oneTimeSessionTimeoutSeconds <= 0) throw new RuntimeException("Invalid value " + oneTimeSessionTimeoutSeconds);
         if(evalTimeoutSeconds <= 0) throw new RuntimeException("Invalid value " + evalTimeoutSeconds);
+        if(sysOutCharLimit <= 0) throw new RuntimeException("Invalid value " + sysOutCharLimit);
         if(maxAliveSessions <= 0) throw new RuntimeException("Invalid value " + maxAliveSessions);
         if(dockerMaxRamMegaBytes <= 0) throw new RuntimeException("Invalid value " + dockerMaxRamMegaBytes);
         if(dockerCPUsUsage <= 0) throw new RuntimeException("Invalid value " + dockerCPUsUsage);

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

@@ -27,7 +27,7 @@ public class JShellService implements Closeable {
     private final boolean renewable;
     private boolean doingOperation;
 
-    public JShellService(JShellSessionService sessionService, String id, long timeout, boolean renewable, long evalTimeout, int maxMemory, double cpus, String startupScript) throws DockerException {
+    public JShellService(JShellSessionService sessionService, String id, long timeout, boolean renewable, long evalTimeout, int sysOutCharLimit, int maxMemory, double cpus, String startupScript) throws DockerException {
         this.sessionService = sessionService;
         this.id = id;
         this.timeout = timeout;
@@ -53,6 +53,7 @@ public JShellService(JShellSessionService sessionService, String id, long timeou
                     "--cpus=" + cpus,
                     "--name", containerName(),
                     "-e", "\"evalTimeoutSeconds=%d\"".formatted(evalTimeout),
+                    "-e", "\"sysOutCharLimit=%d\"".formatted(sysOutCharLimit),
                     "togetherjava.org:5001/togetherjava/jshellwrapper:master")
                     .directory(new File(".."))
                     .redirectError(errorLogs.toFile())

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

@@ -49,15 +49,15 @@ public boolean hasSession(String id) {
 
     public JShellService session(String id, @Nullable StartupScriptId startupScriptId) throws DockerException {
         if(!hasSession(id)) {
-            return createSession(id, config.regularSessionTimeoutSeconds(), true, config.evalTimeoutSeconds(), startupScriptId);
+            return createSession(id, config.regularSessionTimeoutSeconds(), true, config.evalTimeoutSeconds(), config.sysOutCharLimit(), startupScriptId);
         }
         return jshellSessions.get(id);
     }
     public JShellService session(@Nullable StartupScriptId startupScriptId) throws DockerException {
-        return createSession(UUID.randomUUID().toString(), config.regularSessionTimeoutSeconds(), false, config.evalTimeoutSeconds(), startupScriptId);
+        return createSession(UUID.randomUUID().toString(), config.regularSessionTimeoutSeconds(), false, config.evalTimeoutSeconds(), config.sysOutCharLimit(), startupScriptId);
     }
     public JShellService oneTimeSession(@Nullable StartupScriptId startupScriptId) throws DockerException {
-        return createSession(UUID.randomUUID().toString(), config.oneTimeSessionTimeoutSeconds(), false, config.evalTimeoutSeconds(), startupScriptId);
+        return createSession(UUID.randomUUID().toString(), config.oneTimeSessionTimeoutSeconds(), false, config.evalTimeoutSeconds(), config.sysOutCharLimit(), startupScriptId);
     }
 
     public void deleteSession(String id) throws DockerException {
@@ -66,7 +66,7 @@ public void deleteSession(String id) throws DockerException {
         scheduler.schedule(service::close, 500, TimeUnit.MILLISECONDS);
     }
 
-    private synchronized JShellService createSession(String id, long sessionTimeout, boolean renewable, long evalTimeout, @Nullable StartupScriptId startupScriptId) throws DockerException {
+    private synchronized JShellService createSession(String id, long sessionTimeout, boolean renewable, long evalTimeout, int sysOutCharLimit, @Nullable StartupScriptId startupScriptId) throws DockerException {
         if(hasSession(id)) {    //Just in case race condition happens just before createSession
             return jshellSessions.get(id);
         }
@@ -79,6 +79,7 @@ private synchronized JShellService createSession(String id, long sessionTimeout,
                 sessionTimeout,
                 renewable,
                 evalTimeout,
+                sysOutCharLimit,
                 config.dockerMaxRamMegaBytes(),
                 config.dockerCPUsUsage(),
                 startupScriptsService.get(startupScriptId));

JShellAPI/src/main/resources/application.properties

@@ -3,6 +3,7 @@
 jshellapi.regularSessionTimeoutSeconds=1800
 jshellapi.oneTimeSessionTimeoutSeconds=30
 jshellapi.evalTimeoutSeconds=15
+jshellapi.sysOutCharLimit=1024
 jshellapi.maxAliveSessions=10
 
 # Docker limits config