Merge pull request #716 from hubmapconsortium/yuanzhou/log

Yuanzhou/log

.gitignore

@@ -25,6 +25,9 @@ src/instance/search-config.yaml
 
 **/__pycache__/
 
+# Ignore docker env file
+docker/.env
+
 # Docker copied files and directories
 docker/search-api/src
 docker/search-api/VERSION

.gitmodules

@@ -1,5 +1,5 @@
 [submodule "src/search-adaptor"]
 	path = src/search-adaptor
 	url = https://github.com/dbmi-pitt/search-adaptor.git
-	branch = dev-integrate
+	branch = main
 	ignore = dirty

docker/docker-compose.yml

@@ -34,6 +34,13 @@ services:
       - "./search-api/nginx/conf.d:/etc/nginx/conf.d"
     networks:
       - gateway_hubmap
+    # Send docker logs to AWS CloudWatch
+    logging: 
+      driver: awslogs
+      options:
+        awslogs-region: us-east-1
+        awslogs-group: search-api-docker-logs
+        awslogs-stream: ${LOG_STREAM}
 
 networks:
   # This is the network created by gateway to enable communicaton between multiple docker-compose projects

docker/example.env

@@ -0,0 +1 @@
+LOG_STREAM=DEV

src/uwsgi.ini

@@ -5,8 +5,9 @@ chdir = /usr/src/app/src
 # Application's callbale
 module = wsgi:application
 
-# Location of uwsgi log file
-logto = /usr/src/app/log/uwsgi-search-api.log
+# Delegate the logging to the master process 
+# Send logs to stdout instead of file so docker picks it up and writes to AWS CloudWatch
+log-master=true
 
 # Master with 4 worker process (based on CPU number)
 master = true