EASY-2235: Include INITIAL_HEAP_SIZE java cmd argument (#176)

DANS-KNAW · Sep 3, 2019 · de7fe8c · de7fe8c
1 parent c6146d9
commit de7fe8c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/src/main/assembly/dist/install/override.conf → src/main/assembly/dist/install/charset.conf b/src/main/assembly/dist/install/override.conf → src/main/assembly/dist/install/charset.conf
diff --git a/src/main/assembly/dist/install/easy-deposit-api.service b/src/main/assembly/dist/install/easy-deposit-api.service
@@ -2,7 +2,9 @@
 Description=EASY Deposit Api Service
 
 [Service]
+# MAX_HEAP_SIZE is specified in memusage.conf
 ExecStart=/bin/java \
+   $INITIAL_HEAP_SIZE \
    -Dlogback.configurationFile=/etc/opt/dans.knaw.nl/easy-deposit-api/logback-service.xml \
    -Dapp.home=/opt/dans.knaw.nl/easy-deposit-api \
    -Dorg.scalatra.environment="production" \

diff --git a/src/main/assembly/dist/install/memusage.conf b/src/main/assembly/dist/install/memusage.conf
@@ -0,0 +1,2 @@
+[Service]
+Environment="INITIAL_HEAP_SIZE=-Xms64m"
diff --git a/src/main/rpm/2-post-install.sh b/src/main/rpm/2-post-install.sh
@@ -27,7 +27,8 @@ PHASE="POST-INSTALL"
 
 echo "$PHASE: START (Number of current installations: $NUMBER_OF_INSTALLATIONS)"
 service_install_initd_service_script "$INSTALL_DIR/install/$MODULE_NAME-initd.sh" $MODULE_NAME
-service_install_systemd_unit "$INSTALL_DIR/install/$MODULE_NAME.service" $MODULE_NAME "$INSTALL_DIR/install/override.conf"
+service_install_systemd_unit "$INSTALL_DIR/install/$MODULE_NAME.service" $MODULE_NAME "$INSTALL_DIR/install/charset.conf"
+service_install_systemd_unit "$INSTALL_DIR/install/$MODULE_NAME.service" $MODULE_NAME "$INSTALL_DIR/install/memusage.conf"
 service_create_log_directory $MODULE_NAME
 echo "$PHASE: DONE"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[Service]
		Environment="INITIAL_HEAP_SIZE=-Xms64m"