diff options
Diffstat (limited to 'indra/lib')
| -rw-r--r-- | indra/lib/python/indra/base/config.py | 29 | ||||
| -rw-r--r-- | indra/lib/python/indra/base/llsd.py | 1 | ||||
| -rw-r--r-- | indra/lib/python/indra/ipc/servicebuilder.py | 29 |
3 files changed, 49 insertions, 10 deletions
diff --git a/indra/lib/python/indra/base/config.py b/indra/lib/python/indra/base/config.py index 1649933d37..f0119d1295 100644 --- a/indra/lib/python/indra/base/config.py +++ b/indra/lib/python/indra/base/config.py @@ -27,6 +27,7 @@ $/LicenseInfo$ """ import copy +import errno import os import traceback import time @@ -62,6 +63,8 @@ class IndraConfig(object): self._load() def _load(self): + # if you initialize the IndraConfig with None, no attempt + # is made to load any files if self._indra_config_file is None: return @@ -164,22 +167,36 @@ class IndraConfig(object): """ return copy.deepcopy(self._combined_dict) -def load(indra_xml_file = None): +def load(config_xml_file = None): global _g_config - if indra_xml_file is None: + load_default_files = config_xml_file is None + if load_default_files: ## going from: ## "/opt/linden/indra/lib/python/indra/base/config.py" ## to: ## "/opt/linden/etc/indra.xml" - indra_xml_file = realpath( + config_xml_file = realpath( dirname(realpath(__file__)) + "../../../../../../etc/indra.xml") try: - _g_config = IndraConfig(indra_xml_file) + _g_config = IndraConfig(config_xml_file) except IOError: - # indra.xml was not openable, so let's initialize with an empty dict - # some code relies on config behaving this way + # Failure to load passed in file + # or indra.xml default file + if load_default_files: + try: + config_xml_file = realpath( + dirname(realpath(__file__)) + "../../../../../../etc/globals.xml") + _g_config = IndraConfig(config_xml_file) + return + except IOError: + # Failure to load globals.xml + # fall to code below + pass + + # Either failed to load passed in file + # or failed to load all default files _g_config = IndraConfig(None) def dump(indra_xml_file, indra_cfg = None, update_in_mem=False): diff --git a/indra/lib/python/indra/base/llsd.py b/indra/lib/python/indra/base/llsd.py index 5b8f5d7613..057d4e31dc 100644 --- a/indra/lib/python/indra/base/llsd.py +++ b/indra/lib/python/indra/base/llsd.py @@ -126,6 +126,7 @@ def date_to_python(node): if not val: val = "1970-01-01T00:00:00Z" return parse_datestr(val) + def uri_to_python(node): val = node.text or '' diff --git a/indra/lib/python/indra/ipc/servicebuilder.py b/indra/lib/python/indra/ipc/servicebuilder.py index ebd2583385..13a36a392d 100644 --- a/indra/lib/python/indra/ipc/servicebuilder.py +++ b/indra/lib/python/indra/ipc/servicebuilder.py @@ -51,12 +51,10 @@ def build(name, context={}, **kwargs): > servicebuilder.build('version-manager-version', context, version='1.18.1.2') 'http://int.util.vaak.lindenlab.com/channel/Second%20Life%20Release/1.18.1.2' """ - context = context.copy() # shouldn't modify the caller's dictionary - context.update(kwargs) global _g_builder if _g_builder is None: _g_builder = ServiceBuilder() - return _g_builder.buildServiceURL(name, context) + return _g_builder.buildServiceURL(name, context, **kwargs) class ServiceBuilder(object): def __init__(self, services_definition = services_config): @@ -81,13 +79,36 @@ class ServiceBuilder(object): else: self.builders[service['name']] = service_builder - def buildServiceURL(self, name, context): + def buildServiceURL(self, name, context={}, **kwargs): """\ @brief given the environment on construction, return a service URL. @param name The name of the service. @param context A dict of name value lookups for the service. + @param kwargs Any keyword arguments are treated as members of the + context, this allows you to be all 31337 by writing shit like: + servicebuilder.build('name', param=value) @returns Returns the """ + context = context.copy() # shouldn't modify the caller's dictionary + context.update(kwargs) base_url = config.get('services-base-url') svc_path = russ.format(self.builders[name], context) return base_url + svc_path + + +def on_in(query_name, host_key, schema_key): + """\ + @brief Constructs an on/in snippet (for running named queries) + from a schema name and two keys referencing values stored in + indra.xml. + + @param query_name Name of the query. + @param host_key Logical name of destination host. Will be + looked up in indra.xml. + @param schema_key Logical name of destination schema. Will + be looked up in indra.xml. + """ + host_name = config.get(host_key) + schema_name = config.get(schema_key) + return '/'.join( ('on', host_name, 'in', schema_name, query_name.lstrip('/')) ) + |