Merge pull request #405 from wonderflow/changesender

add format && release web for v1.4.6
qiniu · Mar 28, 2018 · 7b98b6c · 7b98b6c
2 parents c6203b9 + 1a21d82
commit 7b98b6c
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/public/asset-manifest.json b/public/asset-manifest.json
@@ -1,6 +1,6 @@
 {
-  "main.css": "static/css/main.6c555a08.css",
-  "main.css.map": "static/css/main.6c555a08.css.map",
-  "main.js": "static/js/main.3ebf324e.js",
-  "main.js.map": "static/js/main.3ebf324e.js.map"
+  "main.css": "static/css/main.756477a0.css",
+  "main.css.map": "static/css/main.756477a0.css.map",
+  "main.js": "static/js/main.3cae1596.js",
+  "main.js.map": "static/js/main.3cae1596.js.map"
 }
diff --git a/public/index.html b/public/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><style>#root,#root>.ant-spin-nested-loading,#root>.ant-spin-nested-loading>.ant-spin-container,.page,.tree,body,html{width:100%;height:100%;margin:0}</style><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="static/favicon.ico"><link href="/static/antd.css" rel="stylesheet"><title>七牛Logkit配置文件助手</title><link href="/static/css/main.6c555a08.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="/static/js/main.3ebf324e.js"></script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><style>#root,#root>.ant-spin-nested-loading,#root>.ant-spin-nested-loading>.ant-spin-container,.page,.tree,body,html{width:100%;height:100%;margin:0}</style><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="static/favicon.ico"><link href="/static/antd.css" rel="stylesheet"><title>七牛Logkit配置文件助手</title><link href="/static/css/main.756477a0.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="/static/js/main.3cae1596.js"></script></body></html>
diff --git a/public/service-worker.js b/public/service-worker.js
diff --git a/public/static/css/main.6c555a08.css → public/static/css/main.756477a0.css b/public/static/css/main.6c555a08.css → public/static/css/main.756477a0.css
diff --git a/public/static/js/main.3cae1596.js b/public/static/js/main.3cae1596.js
diff --git a/public/static/js/main.3ebf324e.js b/public/static/js/main.3ebf324e.js
diff --git a/sender/pandora_sender.go b/sender/pandora_sender.go
@@ -418,6 +418,7 @@ func newPandoraSender(opt *PandoraOption) (s *PandoraSender, err error) {
 	schemas, err := pipeline.DSLtoSchema(dsl)
 	if err != nil {
 		log.Errorf("Runner[%v] Sender[%v]: auto create pandora repo error: %v, you can create on pandora portal, ignored...", opt.runnerName, opt.name, err)
+		err = nil
 	}
 	if initErr := s.client.InitOrUpdateWorkflow(&pipeline.InitOrUpdateWorkflowInput{
 		// 此处要的 schema 为 autoCreate 中用户指定的，所以 SchemaFree 要恒为 true
@@ -465,8 +466,7 @@ func newPandoraSender(opt *PandoraOption) (s *PandoraSender, err error) {
 			ForceDataConvert: s.opt.forceDataConvert,
 		},
 	}); initErr != nil {
-		err = fmt.Errorf("runner[%v] Sender [%v]: init Workflow error %v", opt.runnerName, opt.name, initErr)
-		return
+		log.Errorf("runner[%v] Sender [%v]: init Workflow error %v", opt.runnerName, opt.name, initErr)
 	}
 	s.UpdateSchemas()
 	return

diff --git a/sender/rest_sender_models.go b/sender/rest_sender_models.go
@@ -97,7 +97,7 @@ var ModeKeyOptions = map[string][]Option{
 			ChooseOnly:   false,
 			Default:      "",
 			Required:     true,
-			Placeholder:  "/home/john/mylogs/my.log",
+			Placeholder:  "/home/john/mylogs/my-%Y-%m-%d.log",
 			DefaultNoUse: true,
 			Description:  "发送到指定文件(file_send_path)",
 		},
@@ -110,7 +110,7 @@ var ModeKeyOptions = map[string][]Option{
 			Placeholder:  "logkit_default_workflow",
 			DefaultNoUse: true,
 			Required:     true,
-			Description:  "工作流名称[留空使用旧版](pandora_workflow_name)",
+			Description:  "工作流名称(pandora_workflow_name)",
 			CheckRegex:   "^[a-zA-Z_][a-zA-Z0-9_]{0,127}$",
 		},
 		{