rm nil items in http.responses

.gitignore

@@ -31,8 +31,8 @@ _testmain.go
 /var
 /query
 
+*.txt
 /falcon-query*
 /release
-
-gitversion
-cfg.json
+g/git.go
+cfg.json

g/g.go

@@ -11,9 +11,10 @@ import (
 // 1.3.5 fill response with endpoint & counter when rpc Graph.Query getting errors
 // 1.4.0 restruct query: use simple rpc conn pool
 // 1.4.1 add last item counter, add proc for connpool
+// 1.4.2 rm nil items in http.responses
 
 const (
-	VERSION = "1.4.1"
+	VERSION = "1.4.2"
 )
 
 func init() {

g/git.go

@@ -1,4 +1,4 @@
 package g
 const (
-    COMMIT = "923f80c"
+    COMMIT = "201f64c"
 )

http/graph_http.go

@@ -51,15 +51,15 @@ func configGraphRoutes() {
 			if err != nil {
 				log.Printf("graph.queryOne fail, %v", err)
 			}
+			if result == nil {
+				continue
+			}
 			data = append(data, result)
 		}
 
 		// statistics
 		proc.HistoryResponseCounterCnt.IncrBy(int64(len(data)))
 		for _, item := range data {
-			if item == nil {
-				continue
-			}
 			proc.HistoryResponseItemCnt.IncrBy(int64(len(item.Values)))
 		}
 
@@ -93,6 +93,9 @@ func configGraphRoutes() {
 			if err != nil {
 				log.Printf("graph.info fail, resp: %v, err: %v", info, err)
 			}
+			if info == nil {
+				continue
+			}
 			data = append(data, info)
 		}
 
@@ -126,6 +129,9 @@ func configGraphRoutes() {
 			if err != nil {
 				log.Printf("graph.last fail, resp: %v, err: %v", last, err)
 			}
+			if last == nil {
+				continue
+			}
 			data = append(data, last)
 		}
 
@@ -162,6 +168,9 @@ func configGraphRoutes() {
 			if err != nil {
 				log.Printf("graph.last.raw fail, resp: %v, err: %v", last, err)
 			}
+			if last == nil {
+				continue
+			}
 			data = append(data, last)
 		}
 		// statistics