diff options
| author | Ethan Buchman <ethan@coinculture.info> | 2015-02-27 06:54:57 +0800 |
|---|---|---|
| committer | Ethan Buchman <ethan@coinculture.info> | 2015-02-27 06:54:57 +0800 |
| commit | 5a827417d9cef0d2a765df11e747b1755bf04898 (patch) | |
| tree | cd3764686dcb59f5b1b9faf16c9f29dcc5efd593 /event | |
| parent | 9446489cf3f2eb4b5237b9355b3975fde2886508 (diff) | |
| parent | cc5c8a444dbc23501ba1a131eb2334f4b5e1ce9f (diff) | |
| download | dexon-5a827417d9cef0d2a765df11e747b1755bf04898.tar dexon-5a827417d9cef0d2a765df11e747b1755bf04898.tar.gz dexon-5a827417d9cef0d2a765df11e747b1755bf04898.tar.bz2 dexon-5a827417d9cef0d2a765df11e747b1755bf04898.tar.lz dexon-5a827417d9cef0d2a765df11e747b1755bf04898.tar.xz dexon-5a827417d9cef0d2a765df11e747b1755bf04898.tar.zst dexon-5a827417d9cef0d2a765df11e747b1755bf04898.zip | |
Merge branch 'develop' of https://github.com/ethereum/go-ethereum into develop
Diffstat (limited to 'event')
| -rw-r--r-- | event/filter/eth_filter.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/event/filter/eth_filter.go b/event/filter/eth_filter.go index d298d914d..4ba66a7e0 100644 --- a/event/filter/eth_filter.go +++ b/event/filter/eth_filter.go @@ -37,17 +37,18 @@ func (self *FilterManager) Stop() { func (self *FilterManager) InstallFilter(filter *core.Filter) (id int) { self.filterMu.Lock() + defer self.filterMu.Unlock() id = self.filterId self.filters[id] = filter self.filterId++ - self.filterMu.Unlock() + return id } func (self *FilterManager) UninstallFilter(id int) { self.filterMu.Lock() + defer self.filterMu.Unlock() delete(self.filters, id) - self.filterMu.Unlock() } // GetFilter retrieves a filter installed using InstallFilter. @@ -62,7 +63,7 @@ func (self *FilterManager) filterLoop() { // Subscribe to events events := self.eventMux.Subscribe( core.PendingBlockEvent{}, - core.ChainEvent{}, + //core.ChainEvent{}, state.Logs(nil)) out: |