Browse Source

Improe verbose output

master
Lyndsay Roger 9 years ago
parent
commit
0a164783ca
  1. 9
      crawler.go
  2. 8
      seeder.go

9
crawler.go

@ -83,6 +83,7 @@ func crawlTwistee(tw *Twistee) {
tw.status = statusCG tw.status = statusCG
tw.statusTime = time.Now() tw.statusTime = time.Now()
} }
cs := tw.lastConnect
tw.rating = 0 tw.rating = 0
tw.connectFails = 0 tw.connectFails = 0
tw.lastConnect = time.Now() tw.lastConnect = time.Now()
@ -100,14 +101,16 @@ func crawlTwistee(tw *Twistee) {
} }
if config.verbose { if config.verbose {
log.Printf("status - crawl done: twistee: %s newstatus: %v.%v received_addr: %v added_addr: %v CrawlTime: %s\n", log.Printf("status - crawl done: twistee: %s s:r:f: %v:%v:%v addr: %v:%v CrawlTime: %s Last connect: %v ago\n",
net.JoinHostPort(tw.na.IP.String(), net.JoinHostPort(tw.na.IP.String(),
strconv.Itoa(int(tw.na.Port))), strconv.Itoa(int(tw.na.Port))),
tw.status, tw.status,
tw.rating, tw.rating,
tw.connectFails,
len(ras), len(ras),
added, added,
time.Since(tw.crawlStart).String()) time.Since(tw.crawlStart).String(),
time.Since(cs).String())
} }
// goroutine ends. deffered cleanup runs // goroutine ends. deffered cleanup runs
@ -137,7 +140,7 @@ func crawlIP(tw *Twistee) ([]*wire.NetAddress, *CrawlError) {
} }
defer conn.Close() defer conn.Close()
if config.verbose { if config.debug {
log.Printf("%s - Connected to remote address. Last connect was %v ago\n", ip, time.Since(tw.lastConnect).String()) log.Printf("%s - Connected to remote address. Last connect was %v ago\n", ip, time.Since(tw.lastConnect).String())
} }

8
seeder.go

@ -157,14 +157,10 @@ func (s *Seeder) startCrawlers() {
c.started++ c.started++
} }
if config.verbose || config.stats { log.Printf("stats - started crawler: %s total: %v started: %v\n", c.desc, c.totalCount, c.started)
log.Printf("stats - started crawler: %s total: %v started: %v\n", c.desc, c.totalCount, c.started)
}
} }
if config.verbose || config.stats { log.Printf("stats - crawlers started. total twistees: %d\n", tcount)
log.Printf("stats - completed starting crawlers. total twistees: %d\n", tcount)
}
// returns and read lock released // returns and read lock released
} }

Loading…
Cancel
Save