Merge pull request #67 from awslabs/byo_nginx_log_fixes

Small scikit bring your own fixes

Author: djarpin

advanced_functionality/scikit_bring_your_own/container/Dockerfile

@@ -33,10 +33,6 @@ ENV PYTHONUNBUFFERED=TRUE
 ENV PYTHONDONTWRITEBYTECODE=TRUE
 ENV PATH="/opt/program:${PATH}"
 
-# Make nginx log to stdout/err so that the log messages will be picked up by the
-# Docker logger
-RUN ln -s /dev/stdout /tmp/nginx.access.log && ln -s /dev/stderr /tmp/nginx.error.log
-
 # Set up the program in the image
 COPY decision_trees /opt/program
 WORKDIR /opt/program

advanced_functionality/scikit_bring_your_own/container/decision_trees/nginx.conf

@@ -3,7 +3,7 @@ daemon off; # Prevent forking
 
 
 pid /tmp/nginx.pid;
-error_log /tmp/nginx.error.log;
+error_log /var/log/nginx/error.log;
 
 events {
   # defaults
@@ -12,8 +12,8 @@ events {
 http {
   include /etc/nginx/mime.types;
   default_type application/octet-stream;
-  access_log /tmp/nginx.access.log combined;
-
+  access_log /var/log/nginx/access.log combined;
+  
   upstream gunicorn {
     server unix:/tmp/gunicorn.sock;
   }

advanced_functionality/scikit_bring_your_own/container/decision_trees/serve

@@ -41,6 +41,10 @@ def start_server():
     print('Starting the inference server with {} workers.'.format(model_server_workers))
 
 
+    # link the log streams to stdout/err so they will be logged to the container logs
+    subprocess.check_call(['ln', '-sf', '/dev/stdout', '/var/log/nginx/access.log'])
+    subprocess.check_call(['ln', '-sf', '/dev/stderr', '/var/log/nginx/error.log'])
+
     nginx = subprocess.Popen(['nginx', '-c', '/opt/program/nginx.conf'])
     gunicorn = subprocess.Popen(['gunicorn',
                                  '--timeout', str(model_server_timeout),

advanced_functionality/scikit_bring_your_own/scikit_bring_your_own.ipynb

@@ -481,15 +481,15 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "sess.delete_endpoint(predictor.endpoint)"
+    "# sess.delete_endpoint(predictor.endpoint)"
    ]
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Environment (conda_python3)",
    "language": "python",
-   "name": "python3"
+   "name": "conda_python3"
   },
   "language_info": {
    "codemirror_mode": {