Skip to content

Commit

Permalink
Disable Java check
Browse files Browse the repository at this point in the history
because the way the server start script decides which Java executable
to use is complex, differs between operating systems and is subject to
change. It makes much more sense to do only one Java check (in the
server start script) and forward any error messages to the CLI.
  • Loading branch information
bertfrees committed May 27, 2019
1 parent 9aa1cf5 commit 565d705
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cli/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ func AssertJava(minJavaVersion int) error {
}
//check with the min version
if ver < minJavaVersion {
return fmt.Errorf("A java version 1.7 or greater is need in order to run the pipeline")
return fmt.Errorf("A java version " + strconv.Itoa(minJavaVersion) + " or greater is need in order to run the pipeline")
}
return nil
}
Expand Down
4 changes: 2 additions & 2 deletions dp2/dp2.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var minJavaVersion = 11
func main() {
log.SetFlags(log.Lshortfile)
cnf := cli.NewConfig()
if cnf[cli.STARTING].(bool) {
/*if cnf[cli.STARTING].(bool) {
println("Checking java")
if err := cli.AssertJava(minJavaVersion); err != nil {
fmt.Printf(
Expand All @@ -23,7 +23,7 @@ func main() {
)
os.Exit(-1)
}
}
}*/
// proper error handlign missing

link := cli.NewLink(cnf)
Expand Down

0 comments on commit 565d705

Please sign in to comment.