fix: jdtls out of heap space error (#12)

* fix: jdtls out of heap space error * fix: use os.Kill only * update: player_code submodule * update: player-code submodule
delta · Feb 11, 2024 · 81b6491 · 81b6491
1 parent 6abbe8e
commit 81b6491
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/controllers/file.go b/controllers/file.go
@@ -1,15 +1,15 @@
 package controllers
 
 import (
-	"io/ioutil"
+	"os"
 	"path/filepath"
 
 	"github.com/delta/codecharacter-lsp-2023/models"
 )
 
 func handleFileUpdate(message map[string]interface{}, ws *models.WebsocketConnection) error {
 	filename := "player" + ws.Language.GetExtension()
-	return ioutil.WriteFile(ws.WorkspacePath+"/"+filename, []byte(message["code"].(string)), 0644)
+	return os.WriteFile(ws.WorkspacePath+"/"+filename, []byte(message["code"].(string)), 0644)
 }
 
 func getAbsPath(ws *models.WebsocketConnection) error {

diff --git a/player_code b/player_code
diff --git a/servers/ccls.go b/servers/ccls.go
@@ -2,15 +2,15 @@ package servers
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"os/exec"
 
 	"github.com/delta/codecharacter-lsp-2023/models"
 )
 
 func createCppServer(ws *models.WebsocketConnection) error {
 	filename := "compile_commands.json"
-	err := ioutil.WriteFile(ws.WorkspacePath+"/"+filename, []byte(createCompileCommands(ws)), 0644)
+	err := os.WriteFile(ws.WorkspacePath+"/"+filename, []byte(createCompileCommands(ws)), 0644)
 	if err != nil {
 		return err
 	}

diff --git a/servers/jdt.go b/servers/jdt.go
@@ -8,15 +8,17 @@ import (
 )
 
 func createJavaServer(ws *models.WebsocketConnection) error {
-	workspaceDir, _ := filepath.Abs(ws.WorkspacePath)
+	workspaceDir, err := filepath.Abs(ws.WorkspacePath)
+	if err != nil {
+		return err
+	}
 	ws.LSPServer.Process = exec.Command("java",
 		"-Declipse.application=org.eclipse.jdt.ls.core.id1",
 		"-Dosgi.bundles.defaultStartLevel=4",
-		"-Dosgi.bundles.defaultStartLevel=4",
 		"-Declipse.product=org.eclipse.jdt.ls.core.product",
 		"-Dlog.level=ERROR",
 		"-noverify",
-		"-Xmx100M",
+		"-Xmx512M",
 		"-jar",
 		"/jdt/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar",
 		"-configuration",

diff --git a/utils/websocket.go b/utils/websocket.go
@@ -55,7 +55,7 @@ func InitWebsocket(c echo.Context) error {
 }
 
 func dropConnection(ws *models.WebsocketConnection, c echo.Context) {
-	err := ws.LSPServer.Process.Process.Signal(os.Interrupt)
+	err := ws.LSPServer.Process.Process.Signal(os.Kill)
 	if err != nil {
 		c.Echo().Logger.Error(err)
 	}
+7 −3		cpp/Makefile
+1 −1		cpp/compiler.Dockerfile
+101 −25		cpp/main.cpp
+32 −5		cpp/player_code.cpp
+38 −12		cpp/player_code.h
+ −		cpp/run
+1 −1		cpp/run.cpp
+1 −1		cpp/runner.Dockerfile
+94 −0		cpp/runpvp.cpp
+3 −1		java/Attacker.java
+7 −1		java/Attributes.java
+3 −2		java/Constants.java
+10 −0		java/Game.java
+100 −23		java/Main.java
+32 −0		java/PvPState.java
+106 −0		java/RunPvP.java
+75 −15		python/main.py
+30 −4		python/player_code.py
+2 −0		python/run.py
+96 −0		python/runpvp.py