Skip to content

Commit

Permalink
Expose application to runtime (#574)
Browse files Browse the repository at this point in the history
* Expose application to runtime

* string format instead of argument
  • Loading branch information
cwesdorp authored Sep 23, 2022
1 parent aece262 commit 2a092c0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
10 changes: 8 additions & 2 deletions buildpack/core/java.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from email.mime import application
import json
import logging
import os
Expand Down Expand Up @@ -306,7 +307,7 @@ def _set_jvm_memory(m2ee, vcap):

env_heap_size = os.environ.get("HEAP_SIZE")
max_metaspace_size = os.getenv("MAX_METASPACE_SIZE", "256M")

util.upsert_javaopts(m2ee, "-XX:MaxMetaspaceSize=%s" % max_metaspace_size)

if env_heap_size:
Expand All @@ -333,7 +334,12 @@ def _set_jvm_memory(m2ee, vcap):
)


def update_config(m2ee, vcap_data, runtime_version):
def _set_application_name(m2ee, application_name):
util.upsert_javaopts(m2ee, "-DapplicationName=%s" % application_name)


def update_config(m2ee, application_name, vcap_data, runtime_version):
_set_application_name(m2ee, application_name)
_set_jvm_memory(m2ee, vcap_data)
_set_jvm_locale(m2ee, get_java_major_version(runtime_version))
_set_user_provided_java_options(m2ee)
2 changes: 1 addition & 1 deletion buildpack/start.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def _register_signal_handlers():
# Update runtime configuration based on component configuration
database.update_config(m2ee)
storage.update_config(m2ee)
java.update_config(m2ee, util.get_vcap_data(), runtime_version)
java.update_config(m2ee, application_name, util.get_vcap_data(), runtime_version)
newrelic.update_config(m2ee, application_name)
appdynamics.update_config(m2ee)
dynatrace.update_config(m2ee, application_name)
Expand Down

0 comments on commit 2a092c0

Please sign in to comment.