Merge branch 'development' into 'master'

dev into master

See merge request !10

.gitlab-ci.yml

@@ -7,6 +7,7 @@ variables:
 
 sonarqube:
   stage: sonar-analysis
+  allow_failure: true
   tags:
     - build
   before_script:

lib/elastic_mapping_template_pages.py

@@ -7,7 +7,7 @@ template = {
         "index.mapping.total_fields.limit": 10000,
         #"index.mapping.ignore_malformed": True,
         "number_of_shards" : 1,
-        "number_of_replicas" : 0,
+        "number_of_replicas" : 1,
         "max_ngram_diff": 100,
         "analysis": {
             "filter": {

lib/elastic_mapping_template_posts.py

@@ -7,7 +7,7 @@ template = {
         "index.mapping.total_fields.limit": 10000,
         #"index.mapping.ignore_malformed": True,
         "number_of_shards" : 1,
-        "number_of_replicas" : 0,
+        "number_of_replicas" : 1,
         "max_ngram_diff": 100,
         "analysis": {
             "filter": {

lib/indexer.py

@@ -29,7 +29,7 @@ def index_docs( cfg, content_type, docs ):
     es_body = {
                 "settings" : {
                     "number_of_shards" : 1,
-                    "number_of_replicas" : 0,
+                    "number_of_replicas" : 1,
                     "index.mapping.total_fields.limit": 10000,
                     "refresh_interval": "30s"
                  },
@@ -187,4 +187,4 @@ def pushToMinio( client,bucket_name,image ):
                 bucket_name, file_path, data, length=-1, part_size=10*1024*1024)
         except Exception :
             logger.warning("erreur avec l'image "+image)
-    return True
\ No newline at end of file
+    return True

lib/reindexer.py

@@ -70,10 +70,10 @@ def reindexer(cfg, content_type, content_id=None):
 
   while count1 != count2:
     source_es.indices.refresh(index=source_index)
-    count1 = source_es.count(source_index).get('count')
+    count1 = source_es.count(index=source_index, doc_type='_doc').get('count')
     time.sleep(0.5)
     source_es.indices.refresh(index=source_index)
-    count2 = source_es.count(source_index).get('count')
+    count2 = source_es.count(index=source_index, doc_type='_doc').get('count')
 
   rep = destin_es.reindex(body, wait_for_completion=False)
 

requirements.txt

@@ -5,4 +5,4 @@ elasticsearch>=6.0.0,<7.0.0
 flask
 gunicorn
 pyyaml
-minio
\ No newline at end of file
+minio