Bug 797509 - Fixed a logging problem, made the dates format in mappin…

…g a little simpler.
mr-const · Feb 7, 2013 · 629217a · 629217a
1 parent 7c6c41a
commit 629217a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/socorro/external/elasticsearch/crashstorage.py b/socorro/external/elasticsearch/crashstorage.py
@@ -169,7 +169,7 @@ def _submit_crash_to_elasticsearch(self, processed_crash):
         except pyelasticsearch.exceptions.ElasticHttpError, e:
             self.logger.critical(u'%s may not have been submitted to '
                                  'elasticsearch due to the following: %s',
-                                 (crash_id, e))
+                                 crash_id, e)
             raise
         except Exception:
             self.logger.critical('Submission to elasticsearch failed for %s',

diff --git a/socorro/external/elasticsearch/socorro_index_settings.json b/socorro/external/elasticsearch/socorro_index_settings.json
@@ -15,23 +15,23 @@
             "properties": {
                 "completeddatetime": {
                     "type": "date",
-                    "format": "yyyy-MM-dd'T'HH:mm:ss.SSSSSSZZ||yyyy-MM-dd'T'HH:mm:ss.SSSSSS||yyyy-MM-dd HH:mm:ss.SSSSSSZZ||yyyy-MM-dd HH:mm:ss.SSSSSS||yyyy-MM-dd HH:mm:ss.S"
+                    "format": "yyyy-MM-dd'T'HH:mm:ssZZ||yyyy-MM-dd'T'HH:mm:ss.SSSSSSZZ"
                 },
                 "date_processed": {
                     "type": "date",
-                    "format": "yyyy-MM-dd'T'HH:mm:ss.SSSSSSZZ||yyyy-MM-dd'T'HH:mm:ss.SSSSSS||yyyy-MM-dd HH:mm:ss.SSSSSSZZ||yyyy-MM-dd HH:mm:ss.SSSSSS||yyyy-MM-dd HH:mm:ss.S"
+                    "format": "yyyy-MM-dd'T'HH:mm:ssZZ||yyyy-MM-dd'T'HH:mm:ss.SSSSSSZZ"
                 },
                 "client_crash_date": {
                     "type": "date",
-                    "format": "yyyy-MM-dd'T'HH:mm:ss.SSSSSSZZ||yyyy-MM-dd'T'HH:mm:ss.SSSSSS||yyyy-MM-dd HH:mm:ss.SSSSSSZZ||yyyy-MM-dd HH:mm:ss.SSSSSS||yyyy-MM-dd HH:mm:ss.S"
+                    "format": "yyyy-MM-dd'T'HH:mm:ssZZ||yyyy-MM-dd'T'HH:mm:ss.SSSSSSZZ"
                 },
                 "build_date": {
                     "type": "date",
-                    "format": "yyyy-MM-dd'T'HH:mm:ss.SSSSSSZZ||yyyy-MM-dd'T'HH:mm:ss.SSSSSS||yyyy-MM-dd HH:mm:ss.SSSSSSZZ||yyyy-MM-dd HH:mm:ss.SSSSSS||yyyy-MM-dd HH:mm:ss.S"
+                    "format": "yyyy-MM-dd'T'HH:mm:ssZZ||yyyy-MM-dd'T'HH:mm:ss.SSSSSSZZ"
                 },
                 "startedDateTime": {
                     "type": "date",
-                    "format": "yyyy-MM-dd'T'HH:mm:ss.SSSSSSZZ||yyyy-MM-dd'T'HH:mm:ss.SSSSSS||yyyy-MM-dd HH:mm:ss.SSSSSSZZ||yyyy-MM-dd HH:mm:ss.SSSSSS||yyyy-MM-dd HH:mm:ss.S"
+                    "format": "yyyy-MM-dd'T'HH:mm:ssZZ||yyyy-MM-dd'T'HH:mm:ss.SSSSSSZZ"
                 },
                 "signature": {
                     "type": "multi_field",