Skip to content

Fix https://github.com/ArcadeData/arcadedb/issues/97 #1333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lvca merged 1 commit into from
Nov 20, 2023
Merged

Fix https://github.com/ArcadeData/arcadedb/issues/97 #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 12 additions & 18 deletions package/src/main/scripts/console.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
@REM limitations under the License.
@REM

@echo off
@setlocal

set ERROR_CODE=0
Expand Down Expand Up @@ -55,27 +56,20 @@ echo ARCADEDB home directory = %ARCADEDB_HOME%
rem Always change directory to HOME directory
cd /d %ARCADEDB_HOME%

rem Get remaining unshifted command line arguments and save them in the
set CMD_LINE_ARGS=
rem Get full command line arguments for the batch file
set CMD_LINE_ARGS=%*

:setArgs
if ""%1""=="""" goto doneSetArgs
set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
shift
goto setArgs

:doneSetArgs
set JAVA_OPTS_SCRIPT=-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true -Dfile.encoding=UTF8 -Dpolyglot.engine.WarnInterpreterOnly=false

"%JAVACMD%" ^
-client ^
%JAVA_OPTS% ^
%JAVA_OPTS_SCRIPT% ^
%ARCADEDB_OPTS_MEMORY% ^
%ARCADEDB_JMX% ^
%ARCADEDB_SETTINGS% ^
-cp "%ARCADEDB_HOME%\lib\*" ^
%CMD_LINE_ARGS% ^
com.arcadedb.console.Console
-client ^
%JAVA_OPTS% ^
%JAVA_OPTS_SCRIPT% ^
%ARCADEDB_OPTS_MEMORY% ^
%ARCADEDB_JMX% ^
%ARCADEDB_SETTINGS% ^
%CMD_LINE_ARGS% ^
-cp "%ARCADEDB_HOME%\lib\*" ^
com.arcadedb.console.Console

:end
22 changes: 10 additions & 12 deletions package/src/main/scripts/server.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,8 @@ cd /d %ARCADEDB_HOME%
rem Get remaining unshifted command line arguments and save them in the
set CMD_LINE_ARGS=

:setArgs
if ""%1""=="""" goto doneSetArgs
set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
shift
goto setArgs
:rem Get full command line arguments for the batch file
set CMD_LINE_ARGS=%*

:doneSetArgs

Expand All @@ -90,13 +87,14 @@ rem -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044
rem AND ATTACH TO THE CURRENT HOST, PORT 1044

"%JAVACMD%" ^
-server %JAVA_OPTS% ^
%ARCADEDB_OPTS_MEMORY% ^
%JAVA_OPTS_SCRIPT% ^
%ARCADEDB_JMX% ^
%ARCADEDB_SETTINGS% ^
-cp "%ARCADEDB_HOME%\lib\*" ^
%CMD_LINE_ARGS% com.arcadedb.server.ArcadeDBServer
-server %JAVA_OPTS% ^
%ARCADEDB_OPTS_MEMORY% ^
%JAVA_OPTS_SCRIPT% ^
%ARCADEDB_JMX% ^
%ARCADEDB_SETTINGS% ^
%CMD_LINE_ARGS% ^
-cp "%ARCADEDB_HOME%\lib\*" ^
com.arcadedb.server.ArcadeDBServer

if ERRORLEVEL 1 goto error
goto end
Expand Down