academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ibm-messaging/mq-container into dev

Browse Source
This commit is contained in:
Arthur Barr
2018-05-15 09:38:57 +01:00
parent e18dcbd8e8 5da57489e2
commit 36a24d8864
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/runmqserver/post_init_dev.go
View File

@@ -26,11 +26,15 @@ import (
func postInit(name string) error { func postInit(name string) error {
disable := os.Getenv("MQ_DISABLE_WEB_CONSOLE") disable := os.Getenv("MQ_DISABLE_WEB_CONSOLE")
if disable != "true" && disable != "1" { if disable != "true" && disable != "1" {
// Configure and start the web server, in the background (if installed) // Configure the web server (if installed)
err := configureWebServer()
if err != nil {
return err
}
// Start the web server, in the background (if installed)
// WARNING: No error handling or health checking available for the web server, // WARNING: No error handling or health checking available for the web server,
// which is why it's limited to use with MQ Advanced for Developers only // which is why it's limited to use with MQ Advanced for Developers only
go func() { go func() {
configureWebServer()
startWebServer() startWebServer()
}() }()
} }

2
cmd/runmqserver/webserver.go
View File

@@ -113,7 +113,7 @@ func configureWebServer() error {
} }
err := CopyFile(from, to) err := CopyFile(from, to)
if err != nil { if err != nil {
log.Debug(err) log.Error(err)
return err return err
} }
} }