Skip to content
Snippets Groups Projects
Commit da3ef51e1b4e authored by David Douard's avatar David Douard
Browse files

[ccplugin] flake8

parent a420b5c0c8b1
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"""cubicweb-ctl plugin providing the index-in-es command """cubicweb-ctl plugin providing the index-in-es command
:organization: Logilab :organization: Logilab
:copyright: 2016 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :copyright: 2016-2017 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
""" """
from __future__ import print_function from __future__ import print_function
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
from cubes.elasticsearch.es import indexable_types, fulltext_indexable_rql from cubes.elasticsearch.es import indexable_types, fulltext_indexable_rql
__docformat__ = "restructuredtext en"
HERE = osp.dirname(osp.abspath(__file__)) HERE = osp.dirname(osp.abspath(__file__))
...@@ -34,21 +32,26 @@ ...@@ -34,21 +32,26 @@
name = 'index-in-es' name = 'index-in-es'
min_args = max_args = 1 min_args = max_args = 1
arguments = '<instance id>' arguments = '<instance id>'
options = [('dry-run', {'type': 'yn', 'default': False, options = [
'help': 'set to True if you want to skip the insertion in ES'}), ('dry-run',
('debug', {'type': 'yn', 'default': False, {'type': 'yn', 'default': False,
'help': 'set to True if you want to print' 'help': 'set to True if you want to skip the insertion in ES'}),
'out debug info and progress'}), ('debug',
('etypes', {'type': 'csv', 'default': '', {'type': 'yn', 'default': False,
'help': 'only index given etypes ' 'help': ('set to True if you want to print '
'[default:all indexable types]'}), 'out debug info and progress')}),
('index-name', {'type': 'string', 'default': '', ('etypes',
'help': 'override index-name if you want to use a different ID' {'type': 'csv', 'default': '',
'[default: uses index-name from all-in-one.conf]'}), 'help': 'only index given etypes [default:all indexable types]'}),
('except-etypes', {'type': 'string', 'default': '', ('index-name',
'help': 'all indexable types except given etypes' {'type': 'string', 'default': '',
'[default: []]'}), 'help': ('override index-name if you want to use a different ID'
] '[default: uses index-name from all-in-one.conf]')}),
('except-etypes',
{'type': 'string', 'default': '',
'help': 'all indexable types except given etypes'
'[default: []]'}),
]
def run(self, args): def run(self, args):
"""run the command with its specific arguments""" """run the command with its specific arguments"""
...@@ -64,9 +67,9 @@ ...@@ -64,9 +67,9 @@
if self.config.etypes: if self.config.etypes:
etypes = self.config.etypes etypes = self.config.etypes
else: else:
etypes = indexable_types(schema, etypes = indexable_types(
custom_skip_list=self.config.except_etypes) schema, custom_skip_list=self.config.except_etypes)
assert self.config.except_etypes not in etypes assert self.config.except_etypes not in etypes
if self.config.debug and not self.config.etypes: if self.config.debug and not self.config.etypes:
print(u'found indexable_types {}'.format( print(u'found indexable_types {}'.format(
','.join(etypes))) ','.join(etypes)))
...@@ -69,15 +72,14 @@ ...@@ -69,15 +72,14 @@
assert self.config.except_etypes not in etypes assert self.config.except_etypes not in etypes
if self.config.debug and not self.config.etypes: if self.config.debug and not self.config.etypes:
print(u'found indexable_types {}'.format( print(u'found indexable_types {}'.format(
','.join(etypes))) ','.join(etypes)))
for _ in parallel_bulk(es, for _ in parallel_bulk(
self.bulk_actions(etypes, es, self.bulk_actions(etypes, cnx,
cnx, index_name=self.config.index_name,
index_name=self.config.index_name, dry_run=self.config.dry_run),
dry_run=self.config.dry_run), raise_on_error=False,
raise_on_error=False, raise_on_exception=False):
raise_on_exception=False): pass
pass
else: else:
if self.config.debug: if self.config.debug:
print(u'no elasticsearch configuration found, skipping') print(u'no elasticsearch configuration found, skipping')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment