@@ -77,6 +77,7 @@ func (r *Runner) Run() {
7777 return
7878 }
7979 log .Info ("Total URLs: " , len (urls ))
80+
8081 for i < len (urls ) {
8182 //TODO 老代码
8283 //for t := 0; t < k; t++ {
@@ -102,19 +103,20 @@ func (r *Runner) Run() {
102103 //}
103104
104105 for t := 0 ; t < k ; t ++ {
105- if i == len (urls )- 1 {
106+ task := func () {
107+ log .Debugf (" %d %s %d" , t , urls [i - 1 ], i )
108+ Start2 (urls [i - 1 ], hashmap ) // Start k goroutines
109+ wg .Done ()
110+ }
111+ if i == len (urls ) {
106112 break
107113 }
108114 if urls [i ] != "" {
109115 // 通道通信 发送url 并且 i++
110116 //c := make(chan int)
111117 log .Debugf ("Now Threads: %d" , t )
112118 wg .Add (1 )
113- err := pool .Submit (func () {
114- log .Debugf ("Running Submit %d url is %s %d" , t , urls [i ], i )
115- Start2 (urls [i ], hashmap , i ) // Start k goroutines
116- wg .Done ()
117- })
119+ err := pool .Submit (task )
118120 i ++
119121 if err != nil {
120122 log .Error ("Error submitting job " + urls [i ])
@@ -128,6 +130,7 @@ func (r *Runner) Run() {
128130 }
129131
130132 }
133+ wg .Wait ()
131134
132135}
133136
@@ -160,7 +163,7 @@ func Start(u string, hashmap map[string]interface{}, i int, c chan int) {
160163
161164}
162165
163- func Start2 (u string , hashmap map [string ]interface {}, i int ) {
166+ func Start2 (u string , hashmap map [string ]interface {}) {
164167 log .Infof ("%s Runner started" , u )
165168 //log.Infoln("testing URL: ", u)
166169 //for k, v := range hashmap {
0 commit comments