From ce9ab060d966a8dbcf1395b1be3ab59c31e18fdb Mon Sep 17 00:00:00 2001
From: liangzy <liangzy@gaore.com>
Date: Wed, 6 May 2020 15:30:24 +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

---
 funtion.go | 74 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 34 deletions(-)

diff --git a/funtion.go b/funtion.go
index 246d8cc..8dd5b50 100644
--- a/funtion.go
+++ b/funtion.go
@@ -45,48 +45,54 @@ var adatperSetMapper = map[Adapter]func(l *Logger, level Level) error{
 	},
 
 	AdapterElasticSearch: func(l *Logger, level Level) error {
-
-		dsn := "http://es-cn-0pp1mm3hq000dnbh4.public.elasticsearch.aliyuncs.com:9200/"
-		if os.Getenv(envkey) == "prod" || os.Getenv(envkey) == "" || os.Getenv(envkey) == "gray" {
-			dsn = "http://es-cn-0pp1mm3hq000dnbh4.elasticsearch.aliyuncs.com:9200/"
-		}
-
-		c := EsConfig{
-			Username: "elastic",
-			Password: "Hellogaore@",
-			Dsn:      dsn,
-			Level:    level,
-			Index:    os.Getenv("GRLOG_APP_NAME"),
-		}
-
+		c := GenEsConfig(level)
 		return l.SetLogger(logs.AdapterEs, c.String())
 	},
 
 	AdapterAliLs: func(l *Logger, level Level) error {
+		c := GenAliConfig(level)
+		return l.SetLogger(logs.AdapterAliLS, c.String())
+	},
+}
 
-		var project string = "gaore-app-logstore"
-		var endpoint string
+func GenAliConfig(level Level) AliLSConfig {
+	var project string = "gaore-app-logstore"
+	var endpoint string
 
-		if os.Getenv(envkey) == "prod" || os.Getenv(envkey) == "" || os.Getenv(envkey) == "gray" {
-			endpoint = project + ".cn-shenzhen-intranet.log.aliyuncs.com"
-		} else if os.Getenv(envkey) == "dev" {
-			endpoint = project + ".cn-shenzhen.log.aliyuncs.com"
-		}
+	if os.Getenv(envkey) == "prod" || os.Getenv(envkey) == "" || os.Getenv(envkey) == "gray" {
+		endpoint = project + ".cn-shenzhen-intranet.log.aliyuncs.com"
+	} else if os.Getenv(envkey) == "dev" {
+		endpoint = project + ".cn-shenzhen.log.aliyuncs.com"
+	}
 
-		c := AliLSConfig{
-			Project:   project,
-			Endpoint:  endpoint,
-			KeyID:     "LTAI4GCHwcqtrFD4DHRHxR4k",
-			KeySecret: "Ln19xfVYy6OMlJeF9aBvFl4fhRUKBl",
-			LogStore:  "gaore-app-logstore",
-			Topics:    []string{os.Getenv("GRLOG_APP_NAME")},
-			Source:    "",
-			Level:     level,
-			FlushWhen: 0,
-		}
+	c := AliLSConfig{
+		Project:   project,
+		Endpoint:  endpoint,
+		KeyID:     "LTAI4GCHwcqtrFD4DHRHxR4k",
+		KeySecret: "Ln19xfVYy6OMlJeF9aBvFl4fhRUKBl",
+		LogStore:  "gaore-app-logstore",
+		Topics:    []string{os.Getenv("GRLOG_APP_NAME")},
+		Source:    "",
+		Level:     level,
+		FlushWhen: 0,
+	}
+	return c
+}
 
-		return l.SetLogger(logs.AdapterAliLS, c.String())
-	},
+func GenEsConfig(level Level) EsConfig {
+	dsn := "http://es-cn-0pp1mm3hq000dnbh4.public.elasticsearch.aliyuncs.com:9200/"
+	if os.Getenv(envkey) == "prod" || os.Getenv(envkey) == "" || os.Getenv(envkey) == "gray" {
+		dsn = "http://es-cn-0pp1mm3hq000dnbh4.elasticsearch.aliyuncs.com:9200/"
+	}
+
+	c := EsConfig{
+		Username: "elastic",
+		Password: "Hellogaore@",
+		Dsn:      dsn,
+		Level:    level,
+		Index:    os.Getenv("GRLOG_APP_NAME"),
+	}
+	return c
 }
 
 var adatperDropMapper = map[Adapter]func(l *Logger) error{