From b1db890cd8e8b08ba1f82d971af5916911983309 Mon Sep 17 00:00:00 2001
From: Robert Nishihara <robertnishihara@gmail.com>
Date: Thu, 18 Aug 2016 15:39:19 -0700
Subject: [PATCH] Export GRPC environment variable in Python instead of in
 setup-env.sh (#382)

* Export GRPC logging environment variable in Python.

* Don't wipe PYTHONPATH in setup-env.sh
---
 lib/python/ray/services.py | 2 ++
 lib/python/ray/worker.py   | 2 ++
 setup-env.sh               | 3 +--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/python/ray/services.py b/lib/python/ray/services.py
index 985e99e81..41f79ea22 100644
--- a/lib/python/ray/services.py
+++ b/lib/python/ray/services.py
@@ -10,6 +10,8 @@ import config
 
 _services_env = os.environ.copy()
 _services_env["PATH"] = os.pathsep.join([os.path.dirname(os.path.abspath(__file__)), _services_env["PATH"]])
+# Make GRPC only print error messages.
+_services_env["GRPC_VERBOSITY"] = "ERROR"
 
 # all_processes is a list of the scheduler, object store, and worker processes
 # that have been started by this services module if Ray is being used in local
diff --git a/lib/python/ray/worker.py b/lib/python/ray/worker.py
index 696d520d2..091cc8c82 100644
--- a/lib/python/ray/worker.py
+++ b/lib/python/ray/worker.py
@@ -654,6 +654,8 @@ def init(start_ray_local=False, num_workers=None, num_objstores=None, scheduler_
       Exception: An exception is raised if an inappropriate combination of
         arguments is passed in.
   """
+  # Make GRPC only print error messages.
+  os.environ["GRPC_VERBOSITY"] = "ERROR"
   if driver_mode == raylib.PYTHON_MODE:
     # If starting Ray in PYTHON_MODE, don't start any other processes.
     pass
diff --git a/setup-env.sh b/setup-env.sh
index 1bc201a0c..f86348d2e 100644
--- a/setup-env.sh
+++ b/setup-env.sh
@@ -4,8 +4,7 @@ echo "Adding Ray to PYTHONPATH" 1>&2
 
 ROOT_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd)
 
-export GRPC_VERBOSITY=ERROR # make grpc only print error messages
-export PYTHONPATH="$ROOT_DIR/lib/python/:$ROOT_DIR/thirdparty/numbuf/build"
+export PYTHONPATH="$ROOT_DIR/lib/python/:$ROOT_DIR/thirdparty/numbuf/build:$PYTHONPATH"
 
 # Print instructions for adding Ray to your bashrc.
 unamestr="$(uname)"