diff --git a/cmd/runmqserver/logging.go b/cmd/runmqserver/logging.go index b49f3e7..31c95ba 100644 --- a/cmd/runmqserver/logging.go +++ b/cmd/runmqserver/logging.go @@ -94,6 +94,15 @@ func mirrorLogs(ctx context.Context, wg *sync.WaitGroup, name string, fromStart }) } +func configureDebugLogger() { + debugEnv, ok := os.LookupEnv("DEBUG") + if ok && (debugEnv == "true" || debugEnv == "1") { + debug = true + logrus.SetLevel(logrus.DebugLevel) + logDebug("Debug mode enabled") + } +} + func configureLogger() { if jsonLogs() { formatter := logrus.JSONFormatter{ diff --git a/cmd/runmqserver/main.go b/cmd/runmqserver/main.go index b3a77f6..af9413a 100644 --- a/cmd/runmqserver/main.go +++ b/cmd/runmqserver/main.go @@ -20,139 +20,22 @@ package main import ( "context" "errors" - "io" - "io/ioutil" "os" - "os/exec" - "path/filepath" - "strings" "sync" - "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" - "github.com/ibm-messaging/mq-container/internal/command" "github.com/ibm-messaging/mq-container/internal/name" "github.com/ibm-messaging/mq-container/internal/ready" ) -// createDirStructure creates the default MQ directory structure under /var/mqm -func createDirStructure() error { - out, _, err := command.Run("/opt/mqm/bin/crtmqdir", "-f", "-s") - if err != nil { - log.Printf("Error creating directory structure: %v\n", string(out)) - return err - } - log.Println("Created directory structure under /var/mqm") - return nil -} - -// createQueueManager creates a queue manager, if it doesn't already exist. -// It returns true if one was created, or false if one already existed -func createQueueManager(name string) (bool, error) { - log.Printf("Creating queue manager %v", name) - out, rc, err := command.Run("crtmqm", "-q", "-p", "1414", name) - if err != nil { - // 8=Queue manager exists, which is fine - if rc == 8 { - log.Printf("Detected existing queue manager %v", name) - return false, nil - } - log.Printf("crtmqm returned %v", rc) - log.Println(string(out)) - return false, err - } - return true, nil -} - -func updateCommandLevel() error { - level, ok := os.LookupEnv("MQ_CMDLEVEL") - if ok && level != "" { - log.Printf("Setting CMDLEVEL to %v", level) - out, rc, err := command.Run("strmqm", "-e", "CMDLEVEL="+level) - if err != nil { - log.Printf("Error %v setting CMDLEVEL: %v", rc, string(out)) - return err - } - } - return nil -} - -func startQueueManager() error { - log.Println("Starting queue manager") - out, rc, err := command.Run("strmqm") - if err != nil { - log.Printf("Error %v starting queue manager: %v", rc, string(out)) - return err - } - log.Println("Started queue manager") - return nil -} - -func configureQueueManager() error { - const configDir string = "/etc/mqm" - files, err := ioutil.ReadDir(configDir) - if err != nil { - log.Println(err) - return err - } - - for _, file := range files { - if strings.HasSuffix(file.Name(), ".mqsc") { - abs := filepath.Join(configDir, file.Name()) - cmd := exec.Command("runmqsc") - stdin, err := cmd.StdinPipe() - if err != nil { - log.Println(err) - return err - } - // Open the MQSC file for reading - f, err := os.Open(abs) - if err != nil { - log.Printf("Error opening %v: %v", abs, err) - } - // Copy the contents to stdin of the runmqsc process - _, err = io.Copy(stdin, f) - if err != nil { - log.Printf("Error reading %v: %v", abs, err) - } - f.Close() - stdin.Close() - // Run the command and wait for completion - out, err := cmd.CombinedOutput() - if err != nil { - log.Println(err) - } - // Print the runmqsc output, adding tab characters to make it more readable as part of the log - log.Printf("Output for \"runmqsc\" with %v:\n\t%v", abs, strings.Replace(string(out), "\n", "\n\t", -1)) - } - } - return nil -} - -func stopQueueManager(name string) error { - log.Println("Stopping queue manager") - out, _, err := command.Run("endmqm", "-w", name) - if err != nil { - log.Printf("Error stopping queue manager: %v", string(out)) - return err - } - log.Println("Stopped queue manager") - return nil -} - func doMain() error { configureLogger() + configureDebugLogger() err := ready.Clear() if err != nil { return err } - debugEnv, ok := os.LookupEnv("DEBUG") - if ok && (debugEnv == "true" || debugEnv == "1") { - debug = true - logrus.SetLevel(logrus.DebugLevel) - logDebug("Debug mode enabled") - } name, err := name.GetQueueManagerName() if err != nil { log.Println(err) diff --git a/cmd/runmqserver/mirror_test.go b/cmd/runmqserver/mirror_test.go index 2ce8809..65697ef 100644 --- a/cmd/runmqserver/mirror_test.go +++ b/cmd/runmqserver/mirror_test.go @@ -193,7 +193,6 @@ func TestMirrorLogCancelWhileWaiting(t *testing.T) { } func init() { - fmt.Println("Setting debug level") log.SetLevel(log.DebugLevel) log.SetFormatter(new(simpleTextFormatter)) } diff --git a/cmd/runmqserver/qmgr.go b/cmd/runmqserver/qmgr.go new file mode 100644 index 0000000..b28725a --- /dev/null +++ b/cmd/runmqserver/qmgr.go @@ -0,0 +1,133 @@ +/* +© Copyright IBM Corporation 2017, 2018 + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ +package main + +import ( + "io" + "io/ioutil" + "os" + "os/exec" + "path/filepath" + "strings" + + "github.com/ibm-messaging/mq-container/internal/command" + log "github.com/sirupsen/logrus" +) + +// createDirStructure creates the default MQ directory structure under /var/mqm +func createDirStructure() error { + out, _, err := command.Run("/opt/mqm/bin/crtmqdir", "-f", "-s") + if err != nil { + log.Printf("Error creating directory structure: %v\n", string(out)) + return err + } + log.Println("Created directory structure under /var/mqm") + return nil +} + +// createQueueManager creates a queue manager, if it doesn't already exist. +// It returns true if one was created, or false if one already existed +func createQueueManager(name string) (bool, error) { + log.Printf("Creating queue manager %v", name) + out, rc, err := command.Run("crtmqm", "-q", "-p", "1414", name) + if err != nil { + // 8=Queue manager exists, which is fine + if rc == 8 { + log.Printf("Detected existing queue manager %v", name) + return false, nil + } + log.Printf("crtmqm returned %v", rc) + log.Println(string(out)) + return false, err + } + return true, nil +} + +func updateCommandLevel() error { + level, ok := os.LookupEnv("MQ_CMDLEVEL") + if ok && level != "" { + log.Printf("Setting CMDLEVEL to %v", level) + out, rc, err := command.Run("strmqm", "-e", "CMDLEVEL="+level) + if err != nil { + log.Printf("Error %v setting CMDLEVEL: %v", rc, string(out)) + return err + } + } + return nil +} + +func startQueueManager() error { + log.Println("Starting queue manager") + out, rc, err := command.Run("strmqm") + if err != nil { + log.Printf("Error %v starting queue manager: %v", rc, string(out)) + return err + } + log.Println("Started queue manager") + return nil +} + +func configureQueueManager() error { + const configDir string = "/etc/mqm" + files, err := ioutil.ReadDir(configDir) + if err != nil { + log.Println(err) + return err + } + + for _, file := range files { + if strings.HasSuffix(file.Name(), ".mqsc") { + abs := filepath.Join(configDir, file.Name()) + cmd := exec.Command("runmqsc") + stdin, err := cmd.StdinPipe() + if err != nil { + log.Println(err) + return err + } + // Open the MQSC file for reading + f, err := os.Open(abs) + if err != nil { + log.Printf("Error opening %v: %v", abs, err) + } + // Copy the contents to stdin of the runmqsc process + _, err = io.Copy(stdin, f) + if err != nil { + log.Printf("Error reading %v: %v", abs, err) + } + f.Close() + stdin.Close() + // Run the command and wait for completion + out, err := cmd.CombinedOutput() + if err != nil { + log.Println(err) + } + // Print the runmqsc output, adding tab characters to make it more readable as part of the log + log.Printf("Output for \"runmqsc\" with %v:\n\t%v", abs, strings.Replace(string(out), "\n", "\n\t", -1)) + } + } + return nil +} + +func stopQueueManager(name string) error { + log.Println("Stopping queue manager") + out, _, err := command.Run("endmqm", "-w", name) + if err != nil { + log.Printf("Error stopping queue manager: %v", string(out)) + return err + } + log.Println("Stopped queue manager") + return nil +}