vbatts/microservices-demo
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

log: change log format to JSON payload for better log in Stackdriver (#66)

Browse source 
change the log format in Python and Node.js services.

Effected services are currencyservice, emailservice, paymentservice,
and recommendationservice. Loadgenerator is left as is because of
the diffculty to change the log format and log target in locust.

ref. #47
This commit is contained in:
Yoshi Yamaguchi 2018-10-06 03:23:45 +09:00 • committed by Ahmet Alp Balkan
parent 2771a03727
commit 7f40378ecc
16 changed files with 286 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/emailservice/email_server.py
View file

@ -50,6 +50,9 @@ from grpc_health.v1 import health_pb2_grpc
# except:
# pass
from logger import getJSONLogger
logger = getJSONLogger('emailservice-server')
# Loads confirmation email template from file
env = Environment(
loader=FileSystemLoader('templates'),
@ -78,14 +81,14 @@ class EmailService(BaseEmailService):
"from": {
"address_spec": from_address,
},
"to": [{
"address_spec": email_address
"to": [{
"address_spec": email_address
}],
"subject": "Your Confirmation Email",
"html_body": content
}
)
print("Message sent: {}".format(response.rfc822_message_id))
logger.info("Message sent: {}".format(response.rfc822_message_id))
def SendOrderConfirmation(self, request, context):
email = request.email
@ -95,7 +98,7 @@ class EmailService(BaseEmailService):
confirmation = template.render(order = order)
except TemplateError as err:
context.set_details("An error occurred when preparing the confirmation mail.")
print(err.message)
logger.error(err.message)
context.set_code(grpc.StatusCode.INTERNAL)
return demo_pb2.Empty()
@ -111,7 +114,7 @@ class EmailService(BaseEmailService):
class DummyEmailService(BaseEmailService):
def SendOrderConfirmation(self, request, context):
print('A request to send order confirmation email to {} has been received.'.format(request.email))
logger.info('A request to send order confirmation email to {} has been received.'.format(request.email))
return demo_pb2.Empty()
class HealthCheck():
@ -131,7 +134,7 @@ def start(dummy_mode):
health_pb2_grpc.add_HealthServicer_to_server(service, server)
port = os.environ.get('PORT', "8080")
print("listening on port: "+port)
logger.info("listening on port: "+port)
server.add_insecure_port('[::]:'+port)
server.start()
try:
@ -142,5 +145,5 @@ def start(dummy_mode):
if __name__ == '__main__':
print('starting the email service in dummy mode.')
logger.info('starting the email service in dummy mode.')
start(dummy_mode = True)