cubicweb: comparison server/serverconfig.py

equal deleted inserted replaced

-:14a8f9d434c8
+:bf4bdc601779
 ' to be done when entity are added/modified by users, activate this '
 'option and setup a job using cubicweb-ctl db-rebuild-fti on your '
 'system (using cron for instance).',
 'group': 'main', 'inputlevel': 1,
 }),
 # email configuration
 ('default-recipients-mode',
 {'type' : 'choice',
 'choices' : ('default-dest-addrs', 'users', 'none'),
 'default': 'default-dest-addrs',
 'default': None,
 'help': 'identifier of the repository in the pyro name server',
 'group': 'pyro-server', 'inputlevel': 2,
 }),
 ) + CubicWebConfiguration.options)
 # read the schema from the database
 read_application_schema = True
 bootstrap_schema = True
 # check user's state at login time
 consider_user_state = True
 # hooks registration configuration
 # all hooks should be activated during normal execution
 core_hooks = True
 usergroup_hooks = True
 schema_hooks = True
 security_hooks = True
 application_hooks = True
 # should some hooks be deactivated during [pre|post]create script execution
 free_wheel = False
 # list of enables sources when sources restriction is necessary
 # (eg repository initialization at least)
 _enabled_sources = None
 @wproperty
 def enabled_sources(self, sourceuris=None):
 self._enabled_sources = sourceuris
 clear_cache(self, 'sources')
 @classmethod
 def schemas_lib_dir(cls):
 """application schema directory"""
 return env_path('CW_SCHEMA_LIB', cls.SCHEMAS_LIB_DIR, 'schemas')
 self.init_cubes(self.expand_cubes(get_csv(line)))
 break
 else:
 # no cubes
 self.init_cubes(())
 def write_bootstrap_cubes_file(self, cubes):
 stream = file(join(self.apphome, 'bootstrap_cubes'), 'w')
 stream.write('# this is a generated file only used for bootstraping\n')
 stream.write('# you should not have to edit this\n')
 stream.write('%s\n' % ','.join(cubes))
 stream.close()
 def sources_file(self):
 return join(self.apphome, 'sources')
 # this method has to be cached since when the server is running using a
 # restricted user, this user usually don't have access to the sources
 # configuration file (#16102)
 @cached
 def sources(self):
 allsources = read_config(self.sources_file())
 if self._enabled_sources is None:
 return allsources
 return dict((uri, config) for uri, config in allsources.items()
 if uri in self._enabled_sources or uri == 'admin')
 def pyro_enabled(self):
 """pyro is always enabled in standalone repository configuration"""
 return True
 def load_hooks(self, vreg):
 hooks = {}
 for path in reversed([self.apphome] + self.cubes_path()):
 hooksfile = join(path, 'application_hooks.py')
 if exists(hooksfile):
 self.warning('application_hooks.py is deprecated, use dynamic '
 'objects to register hooks (%s)', hooksfile)
 context = {}
 # Use execfile rather than `load_module_from_name` because
 # the latter gets fooled by the `sys.modules` cache when
 # loading different configurations one after the other
 # (another fix would have been to do :
 #    sys.modules.pop('applications_hooks')
 #  or to modify load_module_from_name so that it provides
 #  a use_cache optional parameter
 if ertype == 'Any':
 ertype = ''
 cb = hookdef.make_callback(event)
 hooks.setdefault(event, {}).setdefault(ertype, []).append(cb)
 return hooks
-def load_schema(self, expand_cubes=False, construction_mode='strict'):
+def load_schema(self, expand_cubes=False, **kwargs):
 from cubicweb.schema import CubicWebSchemaLoader
 if expand_cubes:
 # in case some new dependencies have been introduced, we have to
 # reinitialize cubes so the full filesystem schema is read
 origcubes = self.cubes()
 self._cubes = None
 self.init_cubes(self.expand_cubes(origcubes))
-schema = CubicWebSchemaLoader().load(self, construction_mode=construction_mode)
+schema = CubicWebSchemaLoader().load(self, **kwargs)
 if expand_cubes:
 # restaure original value
 self._cubes = origcubes
 return schema
 def load_bootstrap_schema(self):
 from cubicweb.schema import BootstrapSchemaLoader
 schema = BootstrapSchemaLoader().load(self)
 schema.name = 'bootstrap'
 return schema
 def set_sources_mode(self, sources):
 if 'migration' in sources:
 from cubicweb.server.sources import source_adapter
 assert len(sources) == 1
 enabled_sources = []
 for uri in sources:
 assert uri in known_sources, uri
 enabled_sources = sources
 self._enabled_sources = enabled_sources
 clear_cache(self, 'sources')
 def migration_handler(self, schema=None, interactive=True,
 cnx=None, repo=None, connect=True):
 """return a migration handler instance"""
 from cubicweb.server.migractions import ServerMigrationHelper
 return ServerMigrationHelper(self, schema, interactive=interactive,

branch	tls-sprint
changeset 1666	bf4bdc601779
parent 1263	01152fffd593
child 1977	606923dff11b