Skip to content

Feature/11 #12

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
ginccc merged 2 commits into from
Nov 7, 2016
Merged

Feature/11 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd75e28
fixed #11 fixed assembly build and improved startup scripts
Mobe91 Oct 31, 2016
1ba9e8e
applied different memory limits for configurationserver
Mobe91 Oct 31, 2016
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
2 changes: 0 additions & 2 deletions configurationserver/ConfigurationServerLauncher.sh
View file
Open in desktop

This file was deleted.

33 changes: 32 additions & 1 deletion configurationserver/ConfigurationServerStartup.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,32 @@
java -classpath ".;lib\*" -DEDDI_ENV=production io.sls.configuration.ConfigurationServer
@echo off
if [%1] == [] (
echo "Usage: <environment> [rmi-server-hostname]"
goto end
)

if %1==production (
SET JAVA_OPTS= ^
-server -Xms512m -Xmx512m ^
-XX:+UseConcMarkSweepGC ^
-XX:+CMSParallelRemarkEnabled ^
-XX:+UseCMSInitiatingOccupancyOnly ^
-XX:CMSInitiatingOccupancyFraction=50 ^
-XX:CMSWaitDuration=300000 ^
-XX:+CMSScavengeBeforeRemark ^
-XX:+ScavengeBeforeFullGC ^
-XX:+PrintGCDateStamps -verbose:gc -XX:+PrintGCDetails -Xloggc:gc.log ^
-XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M ^
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=`date`.hprof ^
-Djava.rmi.server.hostname=%2 ^
-Dcom.sun.management.jmxremote.port=9010 ^
-Dcom.sun.management.jmxremote.authenticate=false ^
-Dcom.sun.management.jmxremote.ssl=false
) else if %1==development (
SET JAVA_OPTS=
) else (
echo "Invalid environment %1"
goto end
)

java %JAVA_OPTS% -classpath .;lib/* -DEDDI_ENV=%1 io.sls.configuration.ConfigurationServer
:end
36 changes: 34 additions & 2 deletions configurationserver/ConfigurationServerStartup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,34 @@
#!/bin/sh
java -classpath '.:lib/*' -DEDDI_ENV=production io.sls.configuration.ConfigurationServer
#!/bin/bash

if [ -z "$1" ]; then
echo "Usage: <environment> [rmi-server-hostname]"
exit
fi

if [ "$1" = "production" ]; then

read -d '' JAVA_OPTS <<EOF
-server -Xms512m -Xmx512m
-XX:+UseConcMarkSweepGC
-XX:+CMSParallelRemarkEnabled
-XX:+UseCMSInitiatingOccupancyOnly
-XX:CMSInitiatingOccupancyFraction=50
-XX:CMSWaitDuration=300000
-XX:+CMSScavengeBeforeRemark
-XX:+ScavengeBeforeFullGC
-XX:+PrintGCDateStamps -verbose:gc -XX:+PrintGCDetails -Xloggc:/var/log/gc.log
-XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/eddi/`date`.hprof
-Djava.rmi.server.hostname=$2
-Dcom.sun.management.jmxremote.port=9010
-Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false
EOF

elif [ "$1" = "development" ]; then
JAVA_OPTS=""
else
echo "Invalid environment $1"
exit
fi
java $JAVA_OPTS -classpath '.:lib/*' -DEDDI_ENV=$1 io.sls.configuration.ConfigurationServer
2 changes: 1 addition & 1 deletion configurationserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
</configuration>
<executions>
<execution>
<phase>install</phase>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
Expand Down
27 changes: 11 additions & 16 deletions configurationserver/src/assembly/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,21 @@
<!-- Insert here extra files as configs or, batch files, resources, docs etc-->
<fileSets>
<fileSet>
<outputDirectory>/</outputDirectory>
<includes>
<include>config/*.*</include>
<include>resources/**/*.*</include>
<include>keystore/*.*</include>
<include>*.sh</include>
<include>*.bat</include>
</includes>
<outputDirectory>/</outputDirectory>
<includes>
<include>config/**/*.*</include>
<include>resources/**/*.*</include>
<include>*.sh</include>
<include>*.bat</include>
</includes>
</fileSet>
</fileSets>
<!-- This will scrub your dependencies and add them to your lib folder, I excluded
Test stuff as it is not needed, could have declared the resource as a test
only phase as well would not have had to exclude it here
-->
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
<excludes>
<exclude>junit:junit</exclude>
</excludes>
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<useProjectArtifact>true</useProjectArtifact>
</dependencySet>
</dependencySets>
</assembly>
2 changes: 0 additions & 2 deletions coreserver/CoreServerLauncher.sh
View file
Open in desktop

This file was deleted.

33 changes: 32 additions & 1 deletion coreserver/CoreServerStartup.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,32 @@
java -classpath ".;lib\*" -DEDDI_ENV=production io.sls.core.CoreServer
@echo off
if [%1] == [] (
echo "Usage: <environment> [rmi-server-hostname]"
goto end
)

if %1==production (
SET JAVA_OPTS= ^
-server -Xms1024m -Xmx1024m ^
-XX:+UseConcMarkSweepGC ^
-XX:+CMSParallelRemarkEnabled ^
-XX:+UseCMSInitiatingOccupancyOnly ^
-XX:CMSInitiatingOccupancyFraction=50 ^
-XX:CMSWaitDuration=300000 ^
-XX:+CMSScavengeBeforeRemark ^
-XX:+ScavengeBeforeFullGC ^
-XX:+PrintGCDateStamps -verbose:gc -XX:+PrintGCDetails -Xloggc:gc.log ^
-XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M ^
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=`date`.hprof ^
-Djava.rmi.server.hostname=%2 ^
-Dcom.sun.management.jmxremote.port=9010 ^
-Dcom.sun.management.jmxremote.authenticate=false ^
-Dcom.sun.management.jmxremote.ssl=false
) else if %1==development (
SET JAVA_OPTS=
) else (
echo "Invalid environment %1"
goto end
)

java %JAVA_OPTS% -classpath .;lib/* -DEDDI_ENV=%1 io.sls.core.CoreServer
:end
36 changes: 34 additions & 2 deletions coreserver/CoreServerStartup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,34 @@
#!/bin/sh
java -classpath '.:lib/*' -DEDDI_ENV=production io.sls.core.CoreServer
#!/bin/bash

if [ -z "$1" ]; then
echo "Usage: <environment> [rmi-server-hostname]"
exit
fi

if [ "$1" = "production" ]; then

read -d '' JAVA_OPTS <<EOF
-server -Xms1024m -Xmx1024m
-XX:+UseConcMarkSweepGC
-XX:+CMSParallelRemarkEnabled
-XX:+UseCMSInitiatingOccupancyOnly
-XX:CMSInitiatingOccupancyFraction=50
-XX:CMSWaitDuration=300000
-XX:+CMSScavengeBeforeRemark
-XX:+ScavengeBeforeFullGC
-XX:+PrintGCDateStamps -verbose:gc -XX:+PrintGCDetails -Xloggc:/var/log/gc.log
-XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/eddi/`date`.hprof
-Djava.rmi.server.hostname=$2
-Dcom.sun.management.jmxremote.port=9010
-Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false
EOF

elif [ "$1" = "development" ]; then
JAVA_OPTS=""
else
echo "Invalid environment $1"
exit
fi
java $JAVA_OPTS -classpath '.:lib/*' -DEDDI_ENV=$1 io.sls.core.CoreServer
2 changes: 1 addition & 1 deletion coreserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
</configuration>
<executions>
<execution>
<phase>install</phase>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
Expand Down
13 changes: 4 additions & 9 deletions coreserver/src/assembly/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,19 @@
<fileSet>
<outputDirectory>/</outputDirectory>
<includes>
<include>config/*.*</include>
<include>config/**/*.*</include>
<include>resources/**/*.*</include>
<include>keystore/*.*</include>
<include>*.sh</include>
<include>*.bat</include>
</includes>
</fileSet>
</fileSets>
<!-- This will scrub your dependencies and add them to your lib folder, I excluded
Test stuff as it is not needed, could have declared the resource as a test
only phase as well would not have had to exclude it here
-->
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
<excludes>
<exclude>junit:junit</exclude>
</excludes>
<unpack>false</unpack>
<scope>runtime</scope>
<useProjectArtifact>true</useProjectArtifact>
</dependencySet>
</dependencySets>
</assembly>