disable drop, remove prints

This commit is contained in:
zsfelfoldi 2016-06-26 11:25:34 +02:00
parent 64b136b996
commit a09e88d4bf
4 changed files with 4 additions and 11 deletions

View file

@ -138,7 +138,6 @@ done:
// NewBlockFilter create a new filter that returns blocks that are included into the canonical chain. // NewBlockFilter create a new filter that returns blocks that are included into the canonical chain.
func (s *PublicFilterAPI) NewBlockFilter() (string, error) { func (s *PublicFilterAPI) NewBlockFilter() (string, error) {
fmt.Println("NewBlockFilter")
externalId, err := newFilterId() externalId, err := newFilterId()
if err != nil { if err != nil {
return "", err return "", err
@ -156,10 +155,8 @@ fmt.Println("NewBlockFilter")
filter.BlockCallback = func(block *types.Block, logs vm.Logs) { filter.BlockCallback = func(block *types.Block, logs vm.Logs) {
s.blockMu.Lock() s.blockMu.Lock()
defer s.blockMu.Unlock() defer s.blockMu.Unlock()
fmt.Println("callback")
if queue := s.blockQueue[id]; queue != nil { if queue := s.blockQueue[id]; queue != nil {
fmt.Println(" add")
queue.add(block.Hash()) queue.add(block.Hash())
} }
} }
@ -501,10 +498,8 @@ func (s *PublicFilterAPI) blockFilterChanged(id int) []common.Hash {
s.blockMu.Lock() s.blockMu.Lock()
defer s.blockMu.Unlock() defer s.blockMu.Unlock()
fmt.Println("blockFilterChanged")
if s.blockQueue[id] != nil { if s.blockQueue[id] != nil {
res := s.blockQueue[id].get() res := s.blockQueue[id].get()
fmt.Println(" len = ", len(res))
return res return res
} }
return nil return nil

View file

@ -134,12 +134,9 @@ func (fs *FilterSystem) filterLoop() {
for event := range fs.sub.Chan() { for event := range fs.sub.Chan() {
switch ev := event.Data.(type) { switch ev := event.Data.(type) {
case core.ChainEvent: case core.ChainEvent:
fmt.Println("ChainEvent")
fs.filterMu.RLock() fs.filterMu.RLock()
for _, filter := range fs.chainFilters { for _, filter := range fs.chainFilters {
fmt.Println("1")
if filter.BlockCallback != nil && !filter.created.After(event.Time) { if filter.BlockCallback != nil && !filter.created.After(event.Time) {
fmt.Println("2")
filter.BlockCallback(ev.Block, ev.Logs) filter.BlockCallback(ev.Block, ev.Logs)
} }
} }

View file

@ -159,8 +159,10 @@ fmt.Println("removePeer 1")
} }
case <-time.After(hardRequestTimeout): case <-time.After(hardRequestTimeout):
if !disableClientRemovePeer {
fmt.Println("removePeer 2") fmt.Println("removePeer 2")
f.pm.removePeer(p.id) f.pm.removePeer(p.id)
}
f.reqMu.Lock() f.reqMu.Lock()
close(f.requested[reqID]) close(f.requested[reqID])
delete(f.requested, reqID) delete(f.requested, reqID)

View file

@ -325,10 +325,9 @@ fmt.Println(" done")
// main loop. handle incoming messages. // main loop. handle incoming messages.
for { for {
fmt.Println("handleMsg")
if err := pm.handleMsg(p); err != nil { if err := pm.handleMsg(p); err != nil {
glog.V(logger.Debug).Infof("%v: message handling failed: %v", p, err) glog.V(logger.Debug).Infof("%v: message handling failed: %v", p, err)
fmt.Println(" err:", err) fmt.Println("handleMsg err:", err)
return err return err
} }
} }