Comments on PR

Author: parrobe

CHANGES.md renamed to CHANGELOG.md

@@ -1,21 +1,21 @@
 # Changelog
 
-## May 2018 - v1.0.0
+## May 2018
 
-* Released v1.0.0 of this repository for use with golang dependency management tools
 * Corrected package imports
 * Formatted go code with `go fmt`
 * Rearranged this file
 * Removed logging from golang package `mqmetric`
 * Moved samples to a separate repository
 
-## March 2018
+## March 2018 - v1.0.0
 
 * Added V9.0.5 constant definitions
 * Changed #cgo directives for Windows now the compiler supports standard path names
 * Added mechanism to set MQ userid and password for Prometheus monitor
+* Released v1.0.0 of this repository for use with golang dependency management tools
 
-##October 2017
+## October 2017
 
 * Added V9.0.4 constant definitions - now generated from original MQ source code
 * Added MQSC script to show how to redefine event queues for pub/sub

mqmetric/discover.go

@@ -167,7 +167,7 @@ func discoverClasses(metaPrefix string) error {
 	}
 
 	subsOpened = true
-	return nil
+	return err
 }
 
 func discoverTypes(cl *MonClass) error {
@@ -380,7 +380,7 @@ func discoverQueues(monitoredQueues string) error {
 		err = cmdQObj.Put(putmqmd, pmo, buf)
 
 		if err != nil {
-			return fmt.Errorf("%v", err)
+			return err
 		}
 
 		// Now get the response
@@ -423,7 +423,7 @@ func discoverQueues(monitoredQueues string) error {
 				}
 			}
 		} else {
-			return fmt.Errorf("%v", err)
+			return err
 		}
 	}
 
@@ -453,7 +453,7 @@ func createSubscriptions() error {
 			}
 
 			if err != nil {
-				return fmt.Errorf("Error subscribing: %v", err)
+				return fmt.Errorf("Error subscribing to %s: %v", ty.ObjectTopic, err)
 			}
 		}
 	}
@@ -698,7 +698,7 @@ func ReadPatterns(f string) (string, error) {
 
 	file, err := os.Open(f)
 	if err != nil {
-		return "", fmt.Errorf("Opening file %s: %s", f, err)
+		return "", fmt.Errorf("Error Opening file %s: %v", f, err)
 	}
 	defer file.Close()
 	scanner := bufio.NewScanner(file)
@@ -709,7 +709,7 @@ func ReadPatterns(f string) (string, error) {
 		s += scanner.Text()
 	}
 	if err := scanner.Err(); err != nil {
-		return "", fmt.Errorf("Reading from %s: %s", f, err)
+		return "", fmt.Errorf("Error Reading from %s: %v", f, err)
 	}
 
 	return s, nil

mqmetric/mqif.go

@@ -124,10 +124,10 @@ func InitConnectionStats(qMgrName string, replyQ string, statsQ string, cc *Conn
 	}
 
 	if err != nil {
-		return fmt.Errorf("Cannot access qmgr. Error %s", err)
+		return fmt.Errorf("Cannot access queue manager. Error: %v", err)
 	}
 
-	return nil
+	return err
 }
 
 /*
@@ -202,10 +202,10 @@ func getMessageWithHObj(wait bool, hObj ibmmq.MQObject) ([]byte, error) {
 		if mqreturn.MQRC == ibmmq.MQRC_Q_MGR_NOT_AVAILABLE ||
 			mqreturn.MQRC == ibmmq.MQRC_Q_MGR_NAME_ERROR ||
 			mqreturn.MQRC == ibmmq.MQRC_Q_MGR_QUIESCING {
-			return nil, fmt.Errorf("Queue Manager error: ", err)
+			return nil, fmt.Errorf("Queue Manager error: %v", err)
 		}
 		if mqreturn.MQCC == ibmmq.MQCC_FAILED && mqreturn.MQRC != ibmmq.MQRC_NO_MSG_AVAILABLE {
-			return nil, fmt.Errorf("Get message: ", err)
+			return nil, fmt.Errorf("Get message error: %v", err)
 		}
 	}
 
@@ -232,6 +232,6 @@ func subscribe(topic string) (ibmmq.MQObject, error) {
 	if err != nil {
 		return subObj, fmt.Errorf("Error subscribing to topic '%s': %v", topic, err)
 	}
-	return subObj, nil
 
+	return subObj, err
 }