diff options
| author | Angelos Evripiotis <jevripiotis@bloomberg.net> | 2019-10-14 13:53:00 +0100 |
|---|---|---|
| committer | Angelos Evripiotis <jevripiotis@bloomberg.net> | 2019-10-23 13:14:25 +0100 |
| commit | 9fc1365016988fc0dbb293caef3c30adeba9994c (patch) | |
| tree | fa3b349ae65d1ec7d3e9d78d72a0b83e64be2244 | |
| parent | 014dcb4452174ab4f09338a539f360c5abba91f9 (diff) | |
| download | buildstream-aevri/casdprocessmanager.tar.gz | |
cascache: refactor, extract "connection_string"aevri/casdprocessmanager
Prepare for other kinds of connection, by reducing repetition and having
a single point for configuring the connection string.
| -rw-r--r-- | src/buildstream/_cas/cascache.py | 4 | ||||
| -rw-r--r-- | src/buildstream/_cas/casdprocessmanager.py | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/buildstream/_cas/cascache.py b/src/buildstream/_cas/cascache.py index fb991f6c5..4ddb6a644 100644 --- a/src/buildstream/_cas/cascache.py +++ b/src/buildstream/_cas/cascache.py @@ -111,7 +111,7 @@ class CASCache(): assert self._casd_process_manager, "CASCache was instantiated without buildbox-casd" if not self._casd_channel: - self._casd_channel = grpc.insecure_channel('unix:' + self._casd_process_manager.socket_path) + self._casd_channel = grpc.insecure_channel(self._casd_process_manager.connection_string) self._casd_cas = remote_execution_pb2_grpc.ContentAddressableStorageStub(self._casd_channel) self._local_cas = local_cas_pb2_grpc.LocalContentAddressableStorageStub(self._casd_channel) @@ -1075,5 +1075,5 @@ def _grouper(iterable, n): # class _LimitedCASDProcessManagerProxy: def __init__(self, casd_process_manager): - self.socket_path = casd_process_manager.socket_path + self.connection_string = casd_process_manager.connection_string self.start_time = casd_process_manager.start_time diff --git a/src/buildstream/_cas/casdprocessmanager.py b/src/buildstream/_cas/casdprocessmanager.py index 3a434adce..d7494b255 100644 --- a/src/buildstream/_cas/casdprocessmanager.py +++ b/src/buildstream/_cas/casdprocessmanager.py @@ -50,10 +50,11 @@ class CASDProcessManager: # Place socket in global/user temporary directory to avoid hitting # the socket path length limit. self._socket_tempdir = tempfile.mkdtemp(prefix='buildstream') - self.socket_path = os.path.join(self._socket_tempdir, 'casd.sock') + socket_path = os.path.join(self._socket_tempdir, 'casd.sock') + self.connection_string = "unix:" + socket_path casd_args = [utils.get_host_tool('buildbox-casd')] - casd_args.append('--bind=unix:' + self.socket_path) + casd_args.append('--bind=' + self.connection_string) casd_args.append('--log-level=' + log_level.value) if cache_quota is not None: |