diff --git a/backend/src/appenlight/__init__.py b/backend/src/appenlight/__init__.py index 32f7d29..3a8b9e0 100644 --- a/backend/src/appenlight/__init__.py +++ b/backend/src/appenlight/__init__.py @@ -131,7 +131,7 @@ def main(global_config, **settings): config.include('appenlight_client.ext.pyramid_tween') config.include('ziggurat_foundations.ext.pyramid.sign_in') config.registry.es_conn = pyelasticsearch.ElasticSearch( - settings['elasticsearch.nodes']) + aslist(settings['elasticsearch.nodes'])) config.registry.redis_conn = redis.StrictRedis.from_url( settings['redis.url']) diff --git a/backend/src/appenlight/models/log.py b/backend/src/appenlight/models/log.py index 197f69d..cc264fe 100644 --- a/backend/src/appenlight/models/log.py +++ b/backend/src/appenlight/models/log.py @@ -98,7 +98,7 @@ class Log(Base, BaseModel): return None to_hash = '{}_{}_{}'.format(self.resource_id, self.primary_key, - self.namespace) + self.namespace) return hashlib.sha1(to_hash.encode('utf8')).hexdigest() def es_doc(self): diff --git a/development.ini b/development.ini index f6f50f5..71cad4a 100644 --- a/development.ini +++ b/development.ini @@ -37,7 +37,7 @@ encryption_secret = oEOikr_T98wTh_xLH3w8Se3kmbgAQYSM4poZvPosya0= redis.url = redis://localhost:6379/0 redis.redlock.url = redis://localhost:6379/3 -#solr +#elasticsearch elasticsearch.nodes = http://127.0.0.1:9200 #dirs diff --git a/testing.ini b/testing.ini index 76b3b35..cfdac98 100644 --- a/testing.ini +++ b/testing.ini @@ -25,7 +25,7 @@ encryption_secret = oEOikr_T98wTh_xLH3w8Se3kmbgAQYSM4poZvPosya0= redis.url = redis://localhost:6379/0 redis.redlock.url = redis://localhost:6379/3 -#solr +#elasticsearch elasticsearch.nodes = http://127.0.0.1:9200 #dirs