Skip to content

Commit 382deed

Browse files
committed
add commas to frameworks log, update JMX framework name
1 parent 9fc7670 commit 382deed

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

src/java/finalize/finalize.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ package finalize
22

33
import (
44
"fmt"
5-
"github.com/cloudfoundry/java-buildpack/src/java/common"
65
"os"
76
"path/filepath"
7+
"strings"
8+
9+
"github.com/cloudfoundry/java-buildpack/src/java/common"
810

911
"github.com/cloudfoundry/java-buildpack/src/java/containers"
1012
"github.com/cloudfoundry/java-buildpack/src/java/frameworks"
@@ -157,7 +159,7 @@ func (f *Finalizer) finalizeFrameworks() error {
157159
return nil
158160
}
159161

160-
f.Log.Info("Finalizing frameworks: %v", frameworkNames)
162+
f.Log.Info("Finalizing frameworks: %v", strings.Join(frameworkNames, ","))
161163

162164
// Finalize all detected frameworks
163165
for i, framework := range detectedFrameworks {

src/java/frameworks/cf_metrics_exporter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (f *CfMetricsExporterFramework) Detect() (string, error) {
4040
if err != nil {
4141
return "", fmt.Errorf("cf-metrics-exporter version not found in manifest: %w", err)
4242
}
43-
return fmt.Sprintf("cf-metrics-exporter-%s", version), nil
43+
return fmt.Sprintf("%s (%s)", version.Name, version.Version), nil
4444
}
4545
return "", nil
4646
}

src/java/frameworks/jmx.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ package frameworks
22

33
import (
44
"fmt"
5-
"github.com/cloudfoundry/java-buildpack/src/java/common"
65
"os"
76
"strconv"
7+
8+
"github.com/cloudfoundry/java-buildpack/src/java/common"
89
)
910

1011
// JmxFramework implements JMX (Java Management Extensions) support
@@ -27,7 +28,7 @@ func (j *JmxFramework) Detect() (string, error) {
2728
}
2829

2930
port := j.getPort()
30-
return fmt.Sprintf("jmx=%d", port), nil
31+
return fmt.Sprintf("JMX (port %d)", port), nil
3132
}
3233

3334
// Supply performs JMX setup during supply phase

0 commit comments

Comments
 (0)