This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
The following commit(s) were added to refs/heads/develop by this push:
new 66a198e Modified settings.py
new 719f414 Merge pull request #96 from
bhaktinarvekar/certificate-modifications
66a198e is described below
commit 66a198e68f583423bdc1d967da9abeb2df24ef26
Author: Bhakti Sunil Narvekar <[email protected]>
AuthorDate: Mon Jul 20 18:22:01 2020 -0400
Modified settings.py
---
.../custos-python-sdk/clients/utils/certificate_fetching_rest_client.py | 2 +-
custos-client-sdks/custos-python-sdk/transport/settings.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/custos-client-sdks/custos-python-sdk/clients/utils/certificate_fetching_rest_client.py
b/custos-client-sdks/custos-python-sdk/clients/utils/certificate_fetching_rest_client.py
index 8d66ceb..f86bfd0 100644
---
a/custos-client-sdks/custos-python-sdk/clients/utils/certificate_fetching_rest_client.py
+++
b/custos-client-sdks/custos-python-sdk/clients/utils/certificate_fetching_rest_client.py
@@ -58,7 +58,7 @@ class CertificateFetchingRestClient(object):
def __download_certificate(self):
r = requests.get(url=self.url, params=self.params,
headers=self.header, stream=True, timeout=60, verify=False)
value = r.json()['value']
- path = self.rootdir + "/../transport/certificate.pem"
+ path = self.custos_settings.CUSTOS_CERT_PATH
f = open(path, "w")
f.write(value)
f.close()
diff --git a/custos-client-sdks/custos-python-sdk/transport/settings.py
b/custos-client-sdks/custos-python-sdk/transport/settings.py
index 1a26c34..fac7bda 100644
--- a/custos-client-sdks/custos-python-sdk/transport/settings.py
+++ b/custos-client-sdks/custos-python-sdk/transport/settings.py
@@ -6,7 +6,7 @@ config = configparser.ConfigParser()
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
defaultSettings = os.path.join(BASE_DIR, "transport", "settings.ini")
config.read(defaultSettings)
-cert_path = BASE_DIR + "/transport/certificate.pem"
+cert_path = os.path.join(BASE_DIR,'transport','certificate.pem')
class CustosServerClientSettings(object):
