From c753f9a6ffdbf48dc49b01d8b9b09238e197a401 Mon Sep 17 00:00:00 2001
From: Dan Sanche <sanche@google.com>
Date: Wed, 20 Jun 2018 22:37:56 -0700
Subject: [PATCH] added product catalog address env var

---
 src/recommendationservice/Dockerfile              |  7 +++++--
 .../recommendation_server.py                      | 15 ++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/recommendationservice/Dockerfile b/src/recommendationservice/Dockerfile
index e3ba5f4..b5c34e0 100644
--- a/src/recommendationservice/Dockerfile
+++ b/src/recommendationservice/Dockerfile
@@ -8,6 +8,9 @@ ADD ./*.py /home/
 WORKDIR /home
 
 # set listen port
-ENV PORT=8080
+ENV PORT="8080"
 
-ENTRYPOINT python /home/recommendation_server.py $PORT
+#set product catalog address
+ENV PRODUCT_CATALOG_SERVICE_ADDR="localhost:8081"
+
+ENTRYPOINT python /home/recommendation_server.py
diff --git a/src/recommendationservice/recommendation_server.py b/src/recommendationservice/recommendation_server.py
index f6b388f..834f5ae 100644
--- a/src/recommendationservice/recommendation_server.py
+++ b/src/recommendationservice/recommendation_server.py
@@ -3,8 +3,8 @@ import demo_pb2
 import demo_pb2_grpc
 from concurrent import futures
 import time
-import sys
 import random
+import os
 
 class RecommendationService(demo_pb2_grpc.RecommendationServiceServicer):
     def ListRecommendations(self, request, context):
@@ -17,11 +17,13 @@ class RecommendationService(demo_pb2_grpc.RecommendationServiceServicer):
         return response
 
 if __name__ == "__main__":
-    # get port
-    if len(sys.argv) > 1:
-        port = sys.argv[1]
-    else:
-        port = "8080"
+    # get port from $PORT envar
+    port = os.environ.get('PORT', "8080")
+    # get product catalog service address from $PRODUCT_CATALOG_SERVICE_ADDR envar
+    catalog_addr = os.environ.get('PRODUCT_CATALOG_SERVICE_ADDR', "localhost:8081")
+
+    print("product catalog address: " + catalog_addr)
+    print("listening on port: " + port)
 
     # create gRPC server
     server = grpc.server(futures.ThreadPoolExecutor(max_workers=10))
@@ -30,7 +32,6 @@ if __name__ == "__main__":
     demo_pb2_grpc.add_RecommendationServiceServicer_to_server(RecommendationService(), server)
 
     # start server
-    print("Listening on port " + port)
     server.add_insecure_port('[::]:'+port)
     server.start()