Stateless settings update

This commit is contained in:
lash 2022-05-24 15:56:57 +00:00
parent fd90045762
commit c4ac452e0f
Signed by: lash
GPG Key ID: 21D2E7BB88C2A746
5 changed files with 140 additions and 103 deletions

View File

@ -8,6 +8,7 @@ class SyncTimeRedisCache:
self.state = RedisMonitor('cic-eth-tracker', host=host, port=port, db=db)
self.state.register('lastseen', persist=True)
def cache_time(self, block, tx):
v = self.state.get('lastseen')
if v != None:
@ -15,5 +16,3 @@ class SyncTimeRedisCache:
if v > block.timestamp:
return
self.state.set('lastseen', block.timestamp)

View File

@ -23,5 +23,3 @@ def state_change_callback(k, old_state, new_state):
def filter_change_callback(k, old_state, new_state):
logg.log(logging.STATETRACE, 'filter change: {} {} -> {}'.format(k, old_state, new_state))

View File

@ -14,7 +14,10 @@ import cic_base.cli
# local imports
#from cic_tracker.cache import SyncTimeRedisCache
from cic_tracker.settings import CICTrackerSettings
from cic_tracker.settings import (
CICTrackerSettings,
process_settings,
)
from cic_tracker.callback import (
pre_callback,
post_callback,
@ -53,7 +56,7 @@ config.add(args.until, '_UNTIL', True)
def main():
settings = CICTrackerSettings()
settings.process(config)
process_settings(settings, config)
logg.debug('settings:\n' + str(settings))
drv = ChainInterfaceDriver(

View File

@ -9,7 +9,14 @@ from hexathon import (
to_int as hex_to_int,
strip_0x,
)
from cic_base import CICSettings
#from cic_base import CICSettings
from cic_base.settings import (
process_common,
process_database,
process_trusted_addresses,
process_registry,
process_celery,
)
from cic_sync_filter.callback import CallbackFilter
# local imports
@ -22,15 +29,37 @@ from cic_tracker.callback import (
logg = logging.getLogger(__name__)
class CICTrackerSettings(CICSettings):
class CICTrackerSettings:
def process_sync_interface(self, config):
self.o['SYNCER_INTERFACE'] = EthChainInterface()
def __init__(self):
self.o = {}
self.get = self.o.get
def process_sync_range(self, config):
def set(self, k, v):
self.o[k] = v
def __str__(self):
ks = list(self.o.keys())
ks.sort()
s = ''
for k in ks:
s += '{}: {}\n'.format(k, self.o.get(k))
return s
def process_sync_interface(settings, config):
ifc = EthChainInterface()
settings.set('SYNCER_INTERFACE', ifc)
return settings
def process_sync_range(settings, config):
o = block_latest()
r = self.o['RPC'].do(o)
r = settings.get('RPC').do(o)
block_offset = int(strip_0x(r), 16) + 1
logg.info('network block height at startup is {}'.format(block_offset))
@ -54,11 +83,13 @@ class CICTrackerSettings(CICSettings):
if block_limit == 0:
lock_limit = block_offset
self.o['SYNCER_OFFSET'] = session_block_offset
self.o['SYNCER_LIMIT'] = block_limit
settings.set('SYNCER_OFFSET', session_block_offset)
settings.set('SYNCER_LIMIT', block_limit)
return settings
def process_sync_store(self, config):
def process_sync_store(settings, config):
syncer_store_module = None
syncer_store_class = None
if config.get('SYNCER_BACKEND') == 'fs':
@ -77,10 +108,12 @@ class CICTrackerSettings(CICSettings):
sync_store = syncer_store_class(state_dir, session_id=config.get('SYNCER_SESSION_ID'), state_event_callback=state_change_callback, filter_state_event_callback=filter_change_callback)
logg.info('sync session is {}'.format(sync_store.session_id))
self.o['SYNCER_STORE'] = sync_store
settings.set('SYNCER_STORE', sync_store)
return settings
def __create_callback_filter(self, config, path):
def __create_callback_filter(settings, config, path):
callbacks = []
for cb in config.get('TASKS_TRANSFER_CALLBACKS', '').split(','):
task_split = cb.split(':')
@ -89,40 +122,44 @@ class CICTrackerSettings(CICSettings):
if len(task_split) > 1:
task_queue = task_split[1]
r = self.__create_filter(config, path, 'CallbackFilter')
r = __create_filter(settings, config, path, 'CallbackFilter')
r.set_method(task_name)
def __create_filter(self, config, path, cls):
def __create_filter(settings, config, path, cls):
m = importlib.import_module(path)
o = getattr(m, cls)
r = o(self.o['CHAIN_SPEC'], self.o['CIC_REGISTRY'], config.get('CELERY_QUEUE'))
self.o['SYNCER_STORE'].register(r)
r = o(
settings.get('CHAIN_SPEC'),
settings.get('CIC_REGISTRY'),
config.get('CELERY_QUEUE'),
)
settings.get('SYNCER_STORE').register(r)
return r
def process_sync_filters(self, config):
def process_sync_filters(settings, config):
for v in config.get('SYNCER_FILTER').split(','):
logg.debug('processing filter {}'.format(v))
(path, cls) = v.rsplit('.', maxsplit=1)
if cls == 'CallbackFilter':
self.__create_callback_filter(config, path)
__create_callback_filter(settings, config, path)
else:
self.__create_filter(config, path, cls)
__create_filter(settings, config, path, cls)
return settings
def process(self, config):
super(CICTrackerSettings, self).process(config)
self.process_sync_range(config)
self.process_sync_interface(config)
self.process_sync_store(config)
self.process_sync_filters(config)
def process_settings(settings, config):
settings = process_common(settings, config)
settings = process_trusted_addresses(settings, config)
settings = process_registry(settings, config)
settings = process_celery(settings, config)
settings = process_sync_range(settings, config)
settings = process_sync_interface(settings, config)
settings = process_sync_store(settings, config)
settings = process_sync_filters(settings, config)
settings = process_database(settings, config)
def __str__(self):
ks = list(self.o.keys())
ks.sort()
s = ''
for k in ks:
s += '{}: {}\n'.format(k, self.o.get(k))
return s
return settings

View File

@ -1,4 +1,4 @@
chainsyncer[rocksdb]~=0.3.4
chainlib-eth~=0.1.0
cic-sync-filter~=0.13.1
cic-base[legacy]~=0.13.0
chainsyncer[rocksdb]==0.3.4
chainlib-eth==0.1.0
cic-sync-filter==0.13.1
cic-base[legacy]==0.14.0