[server] Make "sources_by_uri" and "sources_by_eid" properties of repository I.e. do not populate these dict as repo initialization (bootstrap step) but always use information from database. This is needed because when multiple instances of the same application run, if one instance adds a CWSource the other ones will not see it. In particular, when using a scheduler instance, new CWSource will be added by the web instance and not seen by the scheduler which is supposed to update them. We thus define properties for sources_by_eid and sources_by_uri instead attributes on repository instance. CWSource entities are thus retrieved from database every time these properties are accessed. We factor out initialization of the "source" instance (subclass of cubicweb.server.source.AbstractSource) in a _sources() method. Note that this method takes care of calling "init" method on the source as well as "set_schema" (previously done in repo.set_schema(), which now only touches system_source). Accordingly the "init_sources_from_database" method is dropped along with "add_source"/"remove_source" methods. In syncsources hook, we thus drop: * SourceAddedOp operation which called repo.add_source() so that the SourceAddedHook only cares about checking source configuration now; * SourceRemovedOp and SourceRenamedOp operations for the same reason; * SourceConfigUpdatedOp as updating the live config of source is meaningless once we rely on them being retrieved from the database; * SourceHostConfigUpdatedHook hook which is now useless without call to SourceConfigUpdatedOp; In 3.10 migration script, remove usage of sources_by_uri repo attribute which, unless I'm missing something, appears useless (at least now). In tests: * unittest_datafeed: remove test_update_url method since we dropped respective hook; * unittest_ldapsource: LDAPFeedUserDeletionTC.test_a_filter_inactivate() currently fails because it still relies on live config being updated, this will be fixed in the next changeset once all "live source" logic will be removed.

     1

from six import text_type

     2

     3

add_entity_type('CWSource')

     4

add_relation_definition('CWSource', 'cw_source', 'CWSource')

     5

add_entity_type('CWSourceHostConfig')

     6

     7

with session.allow_all_hooks_but('cw.sources'):

     8

    create_entity('CWSource', type=u'native', name=u'system')

     9

commit()

    10

    11

sql('INSERT INTO cw_source_relation(eid_from,eid_to) '

    12

    'SELECT e.eid,s.cw_eid FROM entities as e, cw_CWSource as s '

    13

    'WHERE s.cw_name=e.type')

    14

commit()

    15

    16

for uri, cfg in config.read_sources_file().items():

    17

    if uri in ('system', 'admin'):

    18

        continue

    19

    config = u'\n'.join('%s=%s' % (key, value) for key, value in cfg.items()

    20

                        if key != 'adapter' and value is not None)

    21

    create_entity('CWSource', name=text_type(uri), type=text_type(cfg['adapter']),

    22

                  config=config)

    23

commit()

    24

    25

# rename cwprops for boxes/contentnavigation

    26

for x in rql('Any X,XK WHERE X pkey XK, '

    27

             'X pkey ~= "boxes.%" OR '

    28

             'X pkey ~= "contentnavigation.%"').entities():

    29

    x.cw_set(pkey=u'ctxcomponents.' + x.pkey.split('.', 1)[1])