1 files changed, 49 insertions, 24 deletions

diff --git a/sms-service/src/sms/log/logger.go b/sms-service/src/sms/log/logger.go
index 25da593..660f1ce 100644
--- a/sms-service/src/sms/log/logger.go
+++ b/sms-service/src/sms/log/logger.go
@@ -17,57 +17,82 @@
 package log
 
 import (
+	"fmt"
 	"log"
 	"os"
 )
 
-var errLogger *log.Logger
-var warnLogger *log.Logger
-var infoLogger *log.Logger
+var errL, warnL, infoL *log.Logger
+var stdErr, stdWarn, stdInfo *log.Logger
 
 // Init will be called by sms.go before any other packages use it
 func Init(filePath string) {
+
+	stdErr = log.New(os.Stderr, "ERROR: ", log.Lshortfile|log.LstdFlags)
+	stdWarn = log.New(os.Stdout, "WARNING: ", log.Lshortfile|log.LstdFlags)
+	stdInfo = log.New(os.Stdout, "INFO: ", log.Lshortfile|log.LstdFlags)
+
 	if filePath == "" {
-		errLogger = log.New(os.Stderr, "ERROR: ", log.Lshortfile|log.LstdFlags)
-		warnLogger = log.New(os.Stdout, "WARNING: ", log.Lshortfile|log.LstdFlags)
-		infoLogger = log.New(os.Stdout, "INFO: ", log.Lshortfile|log.LstdFlags)
+		// We will just to std streams
 		return
 	}
 
 	f, err := os.Create(filePath)
 	if err != nil {
-		log.Println("Unable to create a log file")
-		log.Println(err)
-		errLogger = log.New(os.Stderr, "ERROR: ", log.Lshortfile|log.LstdFlags)
-		warnLogger = log.New(os.Stdout, "WARNING: ", log.Lshortfile|log.LstdFlags)
-		infoLogger = log.New(os.Stdout, "INFO: ", log.Lshortfile|log.LstdFlags)
-	} else {
-		errLogger = log.New(f, "ERROR: ", log.Lshortfile|log.LstdFlags)
-		warnLogger = log.New(f, "WARNING: ", log.Lshortfile|log.LstdFlags)
-		infoLogger = log.New(f, "INFO: ", log.Lshortfile|log.LstdFlags)
+		stdErr.Println("Unable to create log file: " + err.Error())
+		return
 	}
+
+	errL = log.New(f, "ERROR: ", log.Lshortfile|log.LstdFlags)
+	warnL = log.New(f, "WARNING: ", log.Lshortfile|log.LstdFlags)
+	infoL = log.New(f, "INFO: ", log.Lshortfile|log.LstdFlags)
 }
 
 // WriteError writes output to the writer we have
-// defined durint its creation with ERROR prefix
+// defined during its creation with ERROR prefix
 func WriteError(msg string) {
-	if errLogger != nil {
-		errLogger.Println(msg)
+	if errL != nil {
+		errL.Output(2, fmt.Sprintln(msg))
+	}
+	if stdErr != nil {
+		stdErr.Output(2, fmt.Sprintln(msg))
 	}
 }
 
 // WriteWarn writes output to the writer we have
-// defined durint its creation with WARNING prefix
+// defined during its creation with WARNING prefix
 func WriteWarn(msg string) {
-	if warnLogger != nil {
-		warnLogger.Println(msg)
+	if warnL != nil {
+		warnL.Output(2, fmt.Sprintln(msg))
+	}
+	if stdWarn != nil {
+		stdWarn.Output(2, fmt.Sprintln(msg))
 	}
 }
 
 // WriteInfo writes output to the writer we have
-// defined durint its creation with INFO prefix
+// defined during its creation with INFO prefix
 func WriteInfo(msg string) {
-	if infoLogger != nil {
-		infoLogger.Println(msg)
+	if infoL != nil {
+		infoL.Output(2, fmt.Sprintln(msg))
+	}
+	if stdInfo != nil {
+		stdInfo.Output(2, fmt.Sprintln(msg))
+	}
+}
+
+//CheckError is a helper function to reduce
+//repitition of error checkign blocks of code
+func CheckError(err error, topic string) error {
+	if err != nil {
+		msg := topic + ": " + err.Error()
+		if errL != nil {
+			errL.Output(2, fmt.Sprintln(msg))
+		}
+		if stdErr != nil {
+			stdErr.Output(2, fmt.Sprintln(msg))
+		}
+		return err
 	}
+	return nil
 }