Use the right exception, update logging to ignore

Author: diox

src/olympia/lib/settings_base.py

@@ -926,7 +926,7 @@ def get_language_url_map():
             'level': logging.WARNING,
             'propagate': True,
         },
-        'elasticsearch': {
+        'elastic_transport.transport': {
             'handlers': ['null'],
             'level': logging.INFO,
             'propagate': False,

src/olympia/search/management/commands/reindex.py

@@ -268,7 +268,6 @@ def execute_workflow(self, workflow):
         self.stdout.write('\n')
 
         # Let's return the /_aliases values.
-        aliases = ES.indices.get_alias()
-        aliases = json.dumps(aliases, sort_keys=True, indent=4)
+        aliases = json.dumps(dict(ES.indices.get_alias()), sort_keys=True, indent=4)
         summary = _SUMMARY % aliases
         self.stdout.write(summary)

src/olympia/search/utils.py

@@ -5,7 +5,8 @@
 from django.conf import settings
 from django.core.management.base import CommandError
 
-from elasticsearch import Elasticsearch, TransportError, helpers, transport
+from elasticsearch import Elasticsearch, helpers, transport
+from elasticsearch.exceptions import NotFoundError
 
 from .models import Reindexing
 
@@ -74,7 +75,7 @@ def unindex_objects(ids, indexer_class):
     for id_ in ids:
         try:
             es.delete(index=index, id=id_)
-        except TransportError:
+        except NotFoundError:
             # We ignore already deleted objects.
             pass