From 3c03b5c49708c858af05198f7027a423ad5ec873 Mon Sep 17 00:00:00 2001
From: liangzy <liangzy@gaore.com>
Date: Thu, 7 May 2020 10:59:16 +0800
Subject: [PATCH] =?UTF-8?q?v1.3.3=20=E6=9A=B4=E9=9C=B2=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 log_test.go            |  2 +-
 logs/alils/alils.go    | 21 ++++++++++++++++-----
 logs/alils/callback.go | 12 ++++++------
 options.go             |  6 ++++++
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/log_test.go b/log_test.go
index 13c921c..e5303bb 100644
--- a/log_test.go
+++ b/log_test.go
@@ -48,7 +48,7 @@ func TestGetAliLs(t *testing.T) {
 		l.Warn("Warn")
 	}
 
-	Close(lable, lable, lable)
+	time.Sleep(time.Hour * 1)
 }
 
 func TestDropAdapter(t *testing.T) {
diff --git a/logs/alils/alils.go b/logs/alils/alils.go
index 7c29b2d..35b24db 100644
--- a/logs/alils/alils.go
+++ b/logs/alils/alils.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/aliyun/aliyun-log-go-sdk/producer"
 	"golib.gaore.com/GaoreGo/grlogs/logs"
+	"runtime"
 	"time"
 )
 
@@ -40,7 +41,10 @@ func (a *alilsLogger) Init(jsonconfig string) error {
 	producerConfig.AccessKeyID = a.KeyID
 	producerConfig.AccessKeySecret = a.KeySecret
 	producerConfig.LingerMs = 100
-	producerConfig.AllowLogLevel = "error"
+	producerConfig.NoRetryStatusCodeList = []int{-1}
+	producerConfig.Retries = 2
+	producerConfig.AllowLogLevel = "err"
+	producerConfig.MaxIoWorkerCount = int64(runtime.NumCPU())
 	a.producer = producer.InitProducer(producerConfig)
 	a.callback = &Callback{}
 	a.producer.Start()
@@ -62,12 +66,19 @@ func (a *alilsLogger) WriteMsg(when time.Time, msg string, level int, lable stri
 
 	log := producer.GenerateLog(uint32(when.Unix()), vals)
 
-	for _, topic := range a.Topics {
-		if err := a.producer.SendLog(a.Project, a.LogStore, topic, a.Source, log); err != nil {
-			return err
+	if env == "dev" || env == "test" {
+		for _, topic := range a.Topics {
+			if err := a.producer.SendLogWithCallBack(a.Project, a.LogStore, topic, a.Source, log, a.callback); err != nil {
+				return err
+			}
+		}
+	} else {
+		for _, topic := range a.Topics {
+			if err := a.producer.SendLog(a.Project, a.LogStore, topic, a.Source, log); err != nil {
+				return err
+			}
 		}
 	}
-
 	return nil
 }
 
diff --git a/logs/alils/callback.go b/logs/alils/callback.go
index 9e20a54..c79edf3 100644
--- a/logs/alils/callback.go
+++ b/logs/alils/callback.go
@@ -16,10 +16,10 @@ func (callback *Callback) Success(result *producer.Result) {
 }
 
 func (callback *Callback) Fail(result *producer.Result) {
-	fmt.Println(result.IsSuccessful())
-	fmt.Println(result.GetErrorCode())
-	fmt.Println(result.GetErrorMessage())
-	fmt.Println(result.GetReservedAttempts())
-	fmt.Println(result.GetRequestId())
-	fmt.Println(result.GetTimeStampMs())
+	fmt.Println("IsSuccessful", result.IsSuccessful())
+	fmt.Println("GetErrorCode", result.GetErrorCode())
+	fmt.Println("GetErrorMessage", result.GetErrorMessage())
+	fmt.Println("GetReservedAttempts", result.GetReservedAttempts())
+	fmt.Println("GetRequestId", result.GetRequestId())
+	fmt.Println("GetTimeStampMs", result.GetTimeStampMs())
 }
diff --git a/options.go b/options.go
index 38a6084..d1a62dd 100644
--- a/options.go
+++ b/options.go
@@ -23,3 +23,9 @@ const (
 	AdapterElasticSearch Adapter = "es"
 	AdapterAliLs         Adapter = "alils"
 )
+
+const (
+	DEV  = "dev"
+	GRAY = "gray"
+	PROD = "prod"
+)