Merge pull request #427 from wuxiangzhou2010/master

fix wrong type error
qiniu · Apr 13, 2018 · 86a9c43 · 86a9c43
2 parents d9cc675 + 566c4e8
commit 86a9c43
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/metric/curl/http.go b/metric/curl/http.go
@@ -219,7 +219,7 @@ func setDataValue(data map[string]interface{}, resp *http.Response, httpData Htt
 
 func compareExpectResult(expectCode, realCode int, expectData, realData string) (error, bool) {
 	if expectCode != realCode {
-		return fmt.Errorf("return status code is: %s, expect: %s", realCode, expectCode), false
+		return fmt.Errorf("return status code is: %d, expect: %d", realCode, expectCode), false
 	}
 	if expectData != "" && !strings.Contains(realData, expectData) {
 		return fmt.Errorf("don't contain: %s", expectData), false

diff --git a/mgr/dataflow.go b/mgr/dataflow.go
@@ -55,8 +55,6 @@ func RawData(readerConfig conf.MapConf) (rawData string, err error) {
 		}
 		return
 	}
-
-	return
 }
 
 //parse模块中各种type的日志都能获取解析后的数据

diff --git a/mgr/mgr.go b/mgr/mgr.go
@@ -663,7 +663,7 @@ func (m *Manager) AddRunner(name string, conf RunnerConfig) (err error) {
 	if err = m.backupRunnerConfig(filename, conf); err != nil {
 		// 回滚, 删除创建的 runner, 备份配置文件失败，所以此处不需要从磁盘删除配置文件
 		if rollBackErr := m.Remove(filename); rollBackErr != nil {
-			log.Errorf("runner <%v> backup RunnerConfig error and rollback error %v", rollBackErr)
+			log.Errorf("runner <%v> backup RunnerConfig error and rollback error %v", name, rollBackErr)
 		}
 	}
 	return

diff --git a/reader/http_reader.go b/reader/http_reader.go
@@ -164,7 +164,7 @@ func (h *HttpReader) storageData(r *bufio.Reader) (err error) {
 		line, err := h.readLine(r)
 		if err != nil {
 			if err != io.EOF {
-				fmt.Errorf("runner[%v] Reader[%v] read data from http request error, %v\n", h.meta.RunnerName, h.Name(), err)
+				log.Errorf("runner[%v] Reader[%v] read data from http request error, %v\n", h.meta.RunnerName, h.Name(), err)
 			}
 			break
 		}

diff --git a/reader/mutireader.go b/reader/mutireader.go
@@ -452,7 +452,7 @@ func (mr *MultiReader) Close() (err error) {
 			defer wg.Done()
 			xerr := mar.Close()
 			if xerr != nil {
-				log.Errorf("Runner[%v] Close ActiveReader %v error %v", mr.meta.RunnerName, ar.originpath, xerr)
+				log.Errorf("Runner[%v] Close ActiveReader %v error %v", mr.meta.RunnerName, mar.originpath, xerr)
 			}
 		}(ar)
 	}

diff --git a/transforms/mutate/script.go b/transforms/mutate/script.go
@@ -113,7 +113,7 @@ func getScriptRes(interpreter string, path string) (string, error) {
 
 	res, err := command.Output()
 	if err != nil {
-		return "", fmt.Errorf("%s - run script err info is %v", err)
+		return "", fmt.Errorf("%s %s - run script err info is %v", interpreter, path, err)
 	}
 
 	return string(res), nil
@@ -125,7 +125,7 @@ func getScriptResFromCmd(script string) (string, error) {
 
 	res, err := command.Output()
 	if err != nil {
-		return "", fmt.Errorf("%s - run script err info is %v", err)
+		return "", fmt.Errorf("%s - run script err info is %v", script, err)
 	}
 
 	return string(res), nil

diff --git a/utils/models/utils.go b/utils/models/utils.go
@@ -198,7 +198,7 @@ func ExtractField(slice []string) ([]string, error) {
 		}
 	default:
 	}
-	err = fmt.Errorf("parameters error,  you can write two parameters like: %{[type]}, default or only one: default")
+	err = fmt.Errorf("parameters error,  you can write two parameters like: %%{[type]}, default or only one: default")
 	return nil, err
 }