diff options
| author | Bruno Wagner <bwagner@riseup.net> | 2016-01-12 17:24:31 -0200 |
|---|---|---|
| committer | Bruno Wagner <bwagner@riseup.net> | 2016-01-12 17:24:31 -0200 |
| commit | 38deb297c4bb909ea496aa5d4de19069d25b6a6f (patch) | |
| tree | f4bac634389db7df80c20d38ea3d5ca7daccd8d6 /service/pixelated | |
| parent | 5cf360add8cdbbdc4ca1c620d5c04a8af8956ace (diff) | |
Issue #577 - Added namespace to search index path
Diffstat (limited to 'service/pixelated')
| -rw-r--r-- | service/pixelated/adapter/search/__init__.py | 4 | ||||
| -rw-r--r-- | service/pixelated/config/services.py | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/service/pixelated/adapter/search/__init__.py b/service/pixelated/adapter/search/__init__.py index 1c06f66c..27563c03 100644 --- a/service/pixelated/adapter/search/__init__.py +++ b/service/pixelated/adapter/search/__init__.py @@ -36,9 +36,9 @@ class SearchEngine(object): DEFAULT_INDEX_HOME = os.path.join(os.environ['HOME'], '.leap') DEFAULT_TAGS = ['inbox', 'sent', 'drafts', 'trash'] - def __init__(self, key, agent_home=DEFAULT_INDEX_HOME): + def __init__(self, key, namespace, agent_home=DEFAULT_INDEX_HOME): self.key = key - self.index_folder = os.path.join(agent_home, 'search_index') + self.index_folder = os.path.join(agent_home, 'search_index', namespace) if not os.path.exists(self.index_folder): os.makedirs(self.index_folder) self._index = self._create_index() diff --git a/service/pixelated/config/services.py b/service/pixelated/config/services.py index b8b355b0..0b9b98df 100644 --- a/service/pixelated/config/services.py +++ b/service/pixelated/config/services.py @@ -23,6 +23,7 @@ class Services(object): search_index_storage_key = self.setup_search_index_storage_key(leap_session.soledad) yield self.setup_search_engine( leap_home, + leap_session.user_auth.uuid, search_index_storage_key) self.wrap_mail_store_with_indexing_mail_store(leap_session) @@ -48,11 +49,11 @@ class Services(object): self.search_engine.index_mails(all_mails) @defer.inlineCallbacks - def setup_search_engine(self, leap_home, search_index_storage_key): + def setup_search_engine(self, leap_home, namespace, search_index_storage_key): key_unicode = yield search_index_storage_key.get_or_create_key() key = str(key_unicode) print 'The key len is: %s' % len(key) - search_engine = SearchEngine(key, agent_home=leap_home) + search_engine = SearchEngine(key, namespace, agent_home=leap_home) self.search_engine = search_engine def setup_mail_service(self, leap_session, search_engine): |