Change ErrorWithMsg and ErrorWithFields to cater for formatting directives

logs/logs.go

@@ -226,7 +226,7 @@ func Info(format string, a ...interface{}) {
 	}
 }
 
-func ErrorWithFields(fields map[string]interface{}, err error) {
+func ErrorWithFields(err error, fields map[string]interface{}) {
 	if disableLogging {
 		return
 	}
@@ -242,17 +242,20 @@ func ErrorWithFields(fields map[string]interface{}, err error) {
 	}
 }
 
-func ErrorWithMsg(message string, err error) {
+func ErrorWithMsg(err error, format string, a ...interface{}) {
 	if disableLogging {
 		return
 	}
 
+	message := fmt.Sprintf(format, a...)
+
 	if err == nil {
 		err = errors.Error(message)
 	}
-	ErrorWithFields(map[string]interface{}{
+
+	ErrorWithFields(err, map[string]interface{}{
 		"message": message,
-	}, err)
+	})
 }
 
 func ErrorMsg(format string, a ...interface{}) {
@@ -262,7 +265,7 @@ func ErrorMsg(format string, a ...interface{}) {
 
 	message := SanitiseLogs(fmt.Sprintf(format, a...))
 
-	ErrorWithMsg(message, nil)
+	ErrorWithMsg(nil, message)
 }
 
 func Warn(format string, a ...interface{}) {
@@ -280,7 +283,7 @@ func Warn(format string, a ...interface{}) {
 	}
 }
 
-func WarnWithFields(fields map[string]interface{}, err error) {
+func WarnWithFields(err error, fields map[string]interface{}) {
 	if disableLogging {
 		return
 	}