Merge pull request #13 from palavrapasse/11-enhancement-telegram-writ…

…er-to-keep-logger-message-format

enhancement: telegram writer to keep logger message format

pkg/telegramclient.go

@@ -1,49 +1,32 @@
 package pkg
 
 import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"net/http"
+	"log"
 )
 
 const messageType = "application/json"
 
 type TelegramClient struct {
-	url    string
-	chatId string
-	logs   []string
+	loggers []*log.Logger
 }
 
 func NewTelegramClient(botToken, chatId string) TelegramClient {
-
-	url := fmt.Sprintf("https://api.telegram.org/bot%s/sendMessage", botToken)
-
-	return TelegramClient{
-		url:    url,
-		logs:   levelPrefix,
-		chatId: chatId,
+	tw := TelegramWriter{
+		botToken: botToken,
+		chatId:   chatId,
 	}
-}
-
-func (tc TelegramClient) Write(ar Record) {
-	log := tc.logs[ar.Level]
 
-	body, err := json.Marshal(map[string]string{
-		"chat_id": tc.chatId,
-		"text":    fmt.Sprintf("%s%s", log, ar.Message),
-	})
+	loggers := make([]*log.Logger, len(levelPrefix))
 
-	if err != nil {
-		return
+	for i, v := range levelPrefix {
+		loggers[i] = log.New(tw, v, defaultLoggerFlag)
 	}
 
-	response, err := http.Post(tc.url, messageType, bytes.NewBuffer(body))
-
-	if err != nil {
-		return
+	return TelegramClient{
+		loggers: loggers,
 	}
+}
 
-	defer response.Body.Close()
-
+func (tc TelegramClient) Write(ar Record) {
+	tc.loggers[ar.Level].Println(ar.Message)
 }

pkg/telegramwriter.go

@@ -0,0 +1,37 @@
+package pkg
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"net/http"
+)
+
+type TelegramWriter struct {
+	botToken string
+	chatId   string
+}
+
+func (tw TelegramWriter) Write(p []byte) (n int, err error) {
+
+	body, err := json.Marshal(map[string]string{
+		"chat_id": tw.chatId,
+		"text":    string(p[:]),
+	})
+
+	if err != nil {
+		return 0, err
+	}
+
+	url := fmt.Sprintf("https://api.telegram.org/bot%s/sendMessage", tw.botToken)
+
+	response, err := http.Post(url, messageType, bytes.NewBuffer(body))
+
+	if err != nil {
+		return 0, err
+	}
+
+	defer response.Body.Close()
+
+	return len(p), nil
+}