Merge pull request #241 from RobertSchaffer1/fix_beamline_endstation_sync

Fixes bug at opls

Author: mrakitin

nslsii/sync_experiment/sync_experiment.py

@@ -180,7 +180,11 @@ def switch_redis_proposal(
         The updated redis dictionary.
     """
     location = prefix if prefix else beamline
-    redis_client = open_redis_client(redis_ssl=redis_ssl, redis_prefix=location)
+    if redis_ssl:
+        redis_client = open_redis_client(redis_ssl=redis_ssl, redis_prefix=location)
+    else:
+        redis_url=f"info.{beamline}.nsls2.bnl.gov"
+        redis_client = open_redis_client(redis_ssl=redis_ssl, redis_prefix=location, redis_url=redis_url)
     if verbose:
         print(f"Redis connection info: {redis_client.client().connection}")
     prefix = f"{prefix}-" if prefix and not redis_ssl else ""

nslsii/utils.py

@@ -51,8 +51,9 @@ def open_redis_client(
     """
     Helper function to get the redis client connection.
     """
-    redis_url = os.getenv("REDIS_HOST", redis_url)
-    if not redis_url:
+    if os.getenv("REDIS_HOST"):
+        redis_url = os.getenv("REDIS_HOST")
+    if redis_url is None:
         if redis_ssl:
             client_loc_id = (
                 redis_prefix if redis_prefix else socket.gethostname().split("-")[0]