Added MESSAGE_ID logging

openprocurement · Jan 13, 2015 · 9cbf6c3 · 9cbf6c3
1 parent 42d072d
commit 9cbf6c3
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 37 deletions.
diff --git a/src/openprocurement/api/migration.py b/src/openprocurement/api/migration.py
@@ -25,7 +25,7 @@ def migrate_data(db, destination=None):
     if cur_version == SCHEMA_VERSION:
         return cur_version
     for step in xrange(cur_version, destination or SCHEMA_VERSION):
-        LOGGER.info("Migrate openprocurement schema from {} to {}".format(step, step + 1))
+        LOGGER.info("Migrate openprocurement schema from {} to {}".format(step, step + 1), extra={'MESSAGE_ID': 'migrate_data'})
         migration_func = globals().get('from{}to{}'.format(step, step + 1))
         if migration_func:
             migration_func(db)

diff --git a/src/openprocurement/api/views/auction.py b/src/openprocurement/api/views/auction.py
@@ -82,7 +82,7 @@ def patch_auction(request):
     """Set urls for access to auction.
     """
     apply_patch(request, src=request.validated['tender_src'])
-    LOGGER.info('Updated auction urls')
+    LOGGER.info('Updated auction urls', extra={'MESSAGE_ID': 'tender_auction_patch'})
     return {'data': request.validated['tender'].serialize("auction_view")}
 
 
@@ -161,5 +161,5 @@ def post_auction(request):
     apply_patch(request, save=False, src=request.validated['tender_src'])
     add_next_award(request)
     save_tender(request)
-    LOGGER.info('Report auction results')
+    LOGGER.info('Report auction results', extra={'MESSAGE_ID': 'tender_auction_post'})
     return {'data': request.context.serialize(request.context.status)}
diff --git a/src/openprocurement/api/views/award.py b/src/openprocurement/api/views/award.py
@@ -171,7 +171,7 @@ def collection_post(self):
         award = Award(award_data)
         tender.awards.append(award)
         save_tender(self.request)
-        LOGGER.info('Created tender award {}'.format(award.id))
+        LOGGER.info('Created tender award {}'.format(award.id), extra={'MESSAGE_ID': 'tender_award_create'})
         self.request.response.status = 201
         self.request.response.headers['Location'] = self.request.route_url('Tender Awards', tender_id=tender.id, award_id=award['id'])
         return {'data': award.serialize("view")}
@@ -306,5 +306,5 @@ def patch(self):
             elif award.status == 'unsuccessful':
                 add_next_award(self.request)
             save_tender(self.request)
-            LOGGER.info('Updated tender award {}'.format(self.request.context.id))
+            LOGGER.info('Updated tender award {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_award_patch'})
         return {'data': award.serialize("view")}
diff --git a/src/openprocurement/api/views/award_complaint.py b/src/openprocurement/api/views/award_complaint.py
@@ -39,7 +39,7 @@ def collection_post(self):
         complaint = Complaint(complaint_data)
         self.request.validated['award'].complaints.append(complaint)
         save_tender(self.request)
-        LOGGER.info('Created tender award complaint {}'.format(complaint.id))
+        LOGGER.info('Created tender award complaint {}'.format(complaint.id), extra={'MESSAGE_ID': 'tender_award_complaint_create'})
         self.request.response.status = 201
         self.request.response.headers['Location'] = self.request.route_url('Tender Award Complaints', tender_id=tender.id, award_id=self.request.validated['award_id'], complaint_id=complaint['id'])
         return {'data': complaint.serialize("view")}
@@ -116,5 +116,5 @@ def patch(self):
                     else:
                         tender.status = 'unsuccessful'
             save_tender(self.request)
-            LOGGER.info('Updated tender award complaint {}'.format(self.request.context.id))
+            LOGGER.info('Updated tender award complaint {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_award_complaint_patch'})
         return {'data': complaint.serialize("view")}
diff --git a/src/openprocurement/api/views/award_complaint_document.py b/src/openprocurement/api/views/award_complaint_document.py
@@ -52,7 +52,7 @@ def collection_post(self):
         document = upload_file(self.request)
         self.request.validated['complaint'].documents.append(document)
         save_tender(self.request)
-        LOGGER.info('Created tender award complaint document {}'.format(document.id))
+        LOGGER.info('Created tender award complaint document {}'.format(document.id), extra={'MESSAGE_ID': 'tender_award_complaint_document_create'})
         self.request.response.status = 201
         document_route = self.request.matched_route.name.replace("collection_", "")
         self.request.response.headers['Location'] = self.request.current_route_url(_route_name=document_route, document_id=document.id, _query={})
@@ -83,7 +83,7 @@ def put(self):
         document = upload_file(self.request)
         self.request.validated['complaint'].documents.append(document)
         save_tender(self.request)
-        LOGGER.info('Updated tender award complaint document {}'.format(self.request.context.id))
+        LOGGER.info('Updated tender award complaint document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_award_complaint_document_put'})
         return {'data': document.serialize("view")}
 
     @view(renderer='json', validators=(validate_patch_document_data,), permission='review_complaint')
@@ -94,5 +94,5 @@ def patch(self):
             self.request.errors.status = 403
             return
         apply_patch(self.request, src=self.request.context.serialize())
-        LOGGER.info('Updated tender award complaint document {}'.format(self.request.context.id))
+        LOGGER.info('Updated tender award complaint document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_award_complaint_document_patch'})
         return {'data': self.request.context.serialize("view")}
diff --git a/src/openprocurement/api/views/award_contract.py b/src/openprocurement/api/views/award_contract.py
@@ -39,7 +39,7 @@ def collection_post(self):
         contract.awardID = self.request.validated['award_id']
         self.request.validated['award'].contracts.append(contract)
         save_tender(self.request)
-        LOGGER.info('Created tender award contract {}'.format(contract.id))
+        LOGGER.info('Created tender award contract {}'.format(contract.id), extra={'MESSAGE_ID': 'tender_award_contract_create'})
         self.request.response.status = 201
         self.request.response.headers['Location'] = self.request.route_url('Tender Award Contracts', tender_id=tender.id, award_id=self.request.validated['award_id'], contract_id=contract['id'])
         return {'data': contract.serialize()}
@@ -65,5 +65,5 @@ def patch(self):
             self.request.errors.status = 403
             return
         apply_patch(self.request, src=self.request.context.serialize())
-        LOGGER.info('Updated tender award contract {}'.format(self.request.context.id))
+        LOGGER.info('Updated tender award contract {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_award_contract_patch'})
         return {'data': self.request.context.serialize()}
diff --git a/src/openprocurement/api/views/award_contract_document.py b/src/openprocurement/api/views/award_contract_document.py
@@ -57,7 +57,7 @@ def collection_post(self):
         document = upload_file(self.request)
         self.request.validated['contract'].documents.append(document)
         save_tender(self.request)
-        LOGGER.info('Created tender award contract document {}'.format(document.id))
+        LOGGER.info('Created tender award contract document {}'.format(document.id), extra={'MESSAGE_ID': 'tender_award_contract_document_create'})
         self.request.response.status = 201
         document_route = self.request.matched_route.name.replace("collection_", "")
         self.request.response.headers['Location'] = self.request.current_route_url(_route_name=document_route, document_id=document.id, _query={})
@@ -93,7 +93,7 @@ def put(self):
         document = upload_file(self.request)
         self.request.validated['contract'].documents.append(document)
         save_tender(self.request)
-        LOGGER.info('Updated tender award contract document {}'.format(self.request.context.id))
+        LOGGER.info('Updated tender award contract document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_award_contract_document_put'})
         return {'data': document.serialize("view")}
 
     @view(renderer='json', validators=(validate_patch_document_data,), permission='edit_tender')
@@ -108,5 +108,5 @@ def patch(self):
             self.request.errors.status = 403
             return
         apply_patch(self.request, src=self.request.context.serialize())
-        LOGGER.info('Updated tender award contract document {}'.format(self.request.context.id))
+        LOGGER.info('Updated tender award contract document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_award_contract_document_patch'})
         return {'data': self.request.context.serialize("view")}
diff --git a/src/openprocurement/api/views/award_document.py b/src/openprocurement/api/views/award_document.py
@@ -52,7 +52,7 @@ def collection_post(self):
         document = upload_file(self.request)
         self.request.validated['award'].documents.append(document)
         save_tender(self.request)
-        LOGGER.info('Created tender award document {}'.format(document.id))
+        LOGGER.info('Created tender award document {}'.format(document.id), extra={'MESSAGE_ID': 'tender_award_document_create'})
         self.request.response.status = 201
         document_route = self.request.matched_route.name.replace("collection_", "")
         self.request.response.headers['Location'] = self.request.current_route_url(_route_name=document_route, document_id=document.id, _query={})
@@ -83,7 +83,7 @@ def put(self):
         document = upload_file(self.request)
         self.request.validated['award'].documents.append(document)
         save_tender(self.request)
-        LOGGER.info('Updated tender award document {}'.format(self.request.context.id))
+        LOGGER.info('Updated tender award document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_award_document_put'})
         return {'data': document.serialize("view")}
 
     @view(renderer='json', validators=(validate_patch_document_data,), permission='edit_tender')
@@ -94,5 +94,5 @@ def patch(self):
             self.request.errors.status = 403
             return
         apply_patch(self.request, src=self.request.context.serialize())
-        LOGGER.info('Updated tender award document {}'.format(self.request.context.id))
+        LOGGER.info('Updated tender award document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_award_document_patch'})
         return {'data': self.request.context.serialize("view")}
diff --git a/src/openprocurement/api/views/bid.py b/src/openprocurement/api/views/bid.py
@@ -118,7 +118,7 @@ def collection_post(self):
         set_ownership(bid, self.request)
         tender.bids.append(bid)
         save_tender(self.request)
-        LOGGER.info('Created tender bid {}'.format(bid.id))
+        LOGGER.info('Created tender bid {}'.format(bid.id), extra={'MESSAGE_ID': 'tender_bid_create'})
         self.request.response.status = 201
         self.request.response.headers['Location'] = self.request.route_url('Tender Bids', tender_id=tender.id, bid_id=bid['id'])
         return {
@@ -251,7 +251,7 @@ def patch(self):
             self.request.errors.status = 403
             return
         apply_patch(self.request, src=self.request.context.serialize())
-        LOGGER.info('Updated tender bid {}'.format(self.request.context.id))
+        LOGGER.info('Updated tender bid {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_bid_patch'})
         return {'data': self.request.context.serialize("view")}
 
     @view(renderer='json', permission='edit_bid')
@@ -293,5 +293,5 @@ def delete(self):
         res = bid.serialize("view")
         tender.bids.remove(bid)
         save_tender(self.request)
-        LOGGER.info('Deleted tender bid {}'.format(self.request.context.id))
+        LOGGER.info('Deleted tender bid {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_bid_delete'})
         return {'data': res}
diff --git a/src/openprocurement/api/views/bid_document.py b/src/openprocurement/api/views/bid_document.py
@@ -56,7 +56,7 @@ def collection_post(self):
         document = upload_file(self.request)
         self.request.validated['bid'].documents.append(document)
         save_tender(self.request)
-        LOGGER.info('Created tender bid document {}'.format(document.id))
+        LOGGER.info('Created tender bid document {}'.format(document.id), extra={'MESSAGE_ID': 'tender_bid_document_create'})
         self.request.response.status = 201
         document_route = self.request.matched_route.name.replace("collection_", "")
         self.request.response.headers['Location'] = self.request.current_route_url(_route_name=document_route, document_id=document.id, _query={})
@@ -91,7 +91,7 @@ def put(self):
         document = upload_file(self.request)
         self.request.validated['bid'].documents.append(document)
         save_tender(self.request)
-        LOGGER.info('Updated tender bid document {}'.format(self.request.context.id))
+        LOGGER.info('Updated tender bid document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_bid_document_put'})
         return {'data': document.serialize("view")}
 
     @view(renderer='json', validators=(validate_patch_document_data,), permission='edit_bid')
@@ -102,5 +102,5 @@ def patch(self):
             self.request.errors.status = 403
             return
         apply_patch(self.request, src=self.request.context.serialize())
-        LOGGER.info('Updated tender bid document {}'.format(self.request.context.id))
+        LOGGER.info('Updated tender bid document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_bid_document_patch'})
         return {'data': self.request.context.serialize("view")}
diff --git a/src/openprocurement/api/views/complaint.py b/src/openprocurement/api/views/complaint.py
@@ -38,7 +38,7 @@ def collection_post(self):
         complaint = Complaint(complaint_data)
         tender.complaints.append(complaint)
         save_tender(self.request)
-        LOGGER.info('Created tender complaint {}'.format(complaint.id))
+        LOGGER.info('Created tender complaint {}'.format(complaint.id), extra={'MESSAGE_ID': 'tender_complaint_create'})
         self.request.response.status = 201
         self.request.response.headers['Location'] = self.request.route_url('Tender Complaints', tender_id=tender.id, complaint_id=complaint.id)
         return {'data': complaint.serialize("view")}
@@ -104,5 +104,5 @@ def patch(self):
                     else:
                         tender.status = 'unsuccessful'
             save_tender(self.request)
-            LOGGER.info('Updated tender complaint {}'.format(self.request.context.id))
+            LOGGER.info('Updated tender complaint {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_complaint_patch'})
         return {'data': self.request.context.serialize("view")}
diff --git a/src/openprocurement/api/views/complaint_document.py b/src/openprocurement/api/views/complaint_document.py
@@ -52,7 +52,7 @@ def collection_post(self):
         document = upload_file(self.request)
         self.request.validated['complaint'].documents.append(document)
         save_tender(self.request)
-        LOGGER.info('Created tender complaint document {}'.format(document.id))
+        LOGGER.info('Created tender complaint document {}'.format(document.id), extra={'MESSAGE_ID': 'tender_complaint_document_create'})
         self.request.response.status = 201
         document_route = self.request.matched_route.name.replace("collection_", "")
         self.request.response.headers['Location'] = self.request.current_route_url(_route_name=document_route, document_id=document.id, _query={})
@@ -83,7 +83,7 @@ def put(self):
         document = upload_file(self.request)
         self.request.validated['complaint'].documents.append(document)
         save_tender(self.request)
-        LOGGER.info('Updated tender complaint document {}'.format(self.request.context.id))
+        LOGGER.info('Updated tender complaint document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_complaint_document_put'})
         return {'data': document.serialize("view")}
 
     @view(renderer='json', validators=(validate_patch_document_data,), permission='review_complaint')
@@ -94,5 +94,5 @@ def patch(self):
             self.request.errors.status = 403
             return
         apply_patch(self.request, src=self.request.context.serialize())
-        LOGGER.info('Updated tender complaint document {}'.format(self.request.context.id))
+        LOGGER.info('Updated tender complaint document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_complaint_document_patch'})
         return {'data': self.request.context.serialize("view")}
diff --git a/src/openprocurement/api/views/question.py b/src/openprocurement/api/views/question.py
@@ -38,7 +38,7 @@ def collection_post(self):
         question = Question(question_data)
         tender.questions.append(question)
         save_tender(self.request)
-        LOGGER.info('Created tender question {}'.format(question.id))
+        LOGGER.info('Created tender question {}'.format(question.id), extra={'MESSAGE_ID': 'tender_question_create'})
         self.request.response.status = 201
         self.request.response.headers['Location'] = self.request.route_url('Tender Questions', tender_id=tender.id, question_id=question.id)
         return {'data': question.serialize("view")}
@@ -65,5 +65,5 @@ def patch(self):
             self.request.errors.status = 403
             return
         apply_patch(self.request, src=self.request.context.serialize())
-        LOGGER.info('Updated tender question {}'.format(self.request.context.id))
+        LOGGER.info('Updated tender question {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_question_patch'})
         return {'data': self.request.context.serialize(tender.status)}
diff --git a/src/openprocurement/api/views/tender.py b/src/openprocurement/api/views/tender.py
@@ -79,7 +79,7 @@ def collection_get(self):
             params['descending'] = descending
         next_offset = datetime.min.isoformat() if descending else get_now().isoformat()
         if fields:
-            LOGGER.info('Used custom fields for tenders list: {}'.format(','.join(sorted(fields.split(',')))))
+            LOGGER.info('Used custom fields for tenders list: {}'.format(','.join(sorted(fields.split(',')))), extra={'MESSAGE_ID': 'tender_list_custom'})
             fields = fields.split(',') + ['dateModified', 'id']
             results = [
                 tender_serialize(i, fields)
@@ -266,7 +266,7 @@ def collection_post(self):
         self.request.validated['tender'] = tender
         self.request.validated['tender_src'] = {}
         save_tender(self.request)
-        LOGGER.info('Created tender {}'.format(tender_id))
+        LOGGER.info('Created tender {}'.format(tender_id), extra={'MESSAGE_ID': 'tender_create'})
         self.request.response.status = 201
         self.request.response.headers[
             'Location'] = self.request.route_url('Tender', tender_id=tender_id)
@@ -444,5 +444,5 @@ def patch(self):
             save_tender(self.request)
         else:
             apply_patch(self.request, src=self.request.validated['tender_src'])
-        LOGGER.info('Updated tender {}'.format(tender.id))
+        LOGGER.info('Updated tender {}'.format(tender.id), extra={'MESSAGE_ID': 'tender_patch'})
         return {'data': tender.serialize(tender.status)}
diff --git a/src/openprocurement/api/views/tender_document.py b/src/openprocurement/api/views/tender_document.py
@@ -51,7 +51,7 @@ def collection_post(self):
         document = upload_file(self.request)
         tender.documents.append(document)
         save_tender(self.request)
-        LOGGER.info('Created tender document {}'.format(document.id))
+        LOGGER.info('Created tender document {}'.format(document.id), extra={'MESSAGE_ID': 'tender_document_create'})
         self.request.response.status = 201
         document_route = self.request.matched_route.name.replace("collection_", "")
         self.request.response.headers['Location'] = self.request.current_route_url(_route_name=document_route, document_id=document.id, _query={})
@@ -82,7 +82,7 @@ def put(self):
         document = upload_file(self.request)
         tender.documents.append(document)
         save_tender(self.request)
-        LOGGER.info('Updated tender document {}'.format(self.request.context.id))
+        LOGGER.info('Updated tender document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_document_put'})
         return {'data': document.serialize("view")}
 
     @view(renderer='json', permission='edit_tender', validators=(validate_patch_document_data,))
@@ -93,5 +93,5 @@ def patch(self):
             self.request.errors.status = 403
             return
         apply_patch(self.request, src=self.request.context.serialize())
-        LOGGER.info('Updated tender document {}'.format(self.request.context.id))
+        LOGGER.info('Updated tender document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_document_patch'})
         return {'data': self.request.context.serialize("view")}