Skip to content

Commit c75e705

Browse files
authored
Update framework name for JMX to be inline with other frameworks (#1216)
* Just show JMX name for consistent framework naming, not jmx=<port>. Note: "JMX enabled on port %d" shows port already. * Consistent frameworks logging, with brackets and commas.
1 parent dd456b4 commit c75e705

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

src/java/finalize/finalize.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ func (f *Finalizer) finalizeFrameworks(ctx *common.Context) error {
175175
return nil
176176
}
177177

178-
f.Log.Info("Finalizing frameworks: %v", strings.Join(frameworkNames, ","))
178+
f.Log.Info("Finalizing frameworks: [%v]", strings.Join(frameworkNames, ","))
179179

180180
for i, framework := range detectedFrameworks {
181181
f.Log.Info("Finalizing framework: %s", frameworkNames[i])

src/java/frameworks/jmx.go

Lines changed: 3 additions & 3 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
@@ -30,8 +31,7 @@ func (j *JmxFramework) Detect() (string, error) {
3031
return "", nil
3132
}
3233

33-
port := config.getPort()
34-
return fmt.Sprintf("jmx=%d", port), nil
34+
return "JMX", nil
3535
}
3636

3737
// Supply performs JMX setup during supply phase

src/java/supply/supply.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package supply
22

33
import (
44
"fmt"
5+
"strings"
6+
57
"github.com/cloudfoundry/java-buildpack/src/java/common"
68

79
"github.com/cloudfoundry/java-buildpack/src/java/containers"
@@ -150,7 +152,7 @@ func (s *Supplier) installFrameworks() error {
150152
return nil
151153
}
152154

153-
s.Log.Info("Detected frameworks: %v", frameworkNames)
155+
s.Log.Info("Detected frameworks: [%v]", strings.Join(frameworkNames, ","))
154156

155157
// Install all detected frameworks
156158
// Framework installation errors are fatal and will abort the build,

0 commit comments

Comments
 (0)