From ac7a5a3fc731e83049a2833c06bae5cb00d76ecd Mon Sep 17 00:00:00 2001 From: samueltwum1 <samueltwum1@gmail.com> Date: Tue, 15 Sep 2020 11:22:32 +0200 Subject: [PATCH] SAR-149 update pipfile to include skuid --- Pipfile | 1 + src/ska/logging/transactions.py | 5 +++-- tests/test_transactions.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Pipfile b/Pipfile index 03db77c..6c9d4f2 100644 --- a/Pipfile +++ b/Pipfile @@ -25,6 +25,7 @@ sphinx_rtd_theme = "*" sphinx-autobuild = "*" sphinxcontrib-websupport = "*" recommonmark = "*" +skuid = {editable = true, ref = "SAR-147_add_txn_id_endpoint", git = "https://gitlab.com/ska-telescope/skuid.git"} [dev-packages] diff --git a/src/ska/logging/transactions.py b/src/ska/logging/transactions.py index 693171f..234d5be 100644 --- a/src/ska/logging/transactions.py +++ b/src/ska/logging/transactions.py @@ -7,7 +7,7 @@ import os from typing import Mapping, Text -from skuid.client import SkuidClient, get_local_transaction_id +from ska.skuid.client import SkuidClient, get_local_transaction_id class transaction: """Transaction context handler. @@ -48,7 +48,8 @@ class transaction: def __exit__(self, exc_type, exc_val, exc_tb): # TODO: more to be done with func arguments - + transaction_id = self._get_new_or_existing_transaction_id() + params_json = json.dumps(self._params) self.logger.info(f"Exit transaction {self._name}, {transaction_id}, {params_json}") def _get_new_or_existing_transaction_id(self): diff --git a/tests/test_transactions.py b/tests/test_transactions.py index a4032ef..4205484 100644 --- a/tests/test_transactions.py +++ b/tests/test_transactions.py @@ -95,7 +95,7 @@ class TestTransactionIdGenerator: def test_remote_id_generator_increments_on_next(self, monkeypatch): monkeypatch.setenv("SKUID_URL", "endpoint/to/skuid-client") - with patch("skuid.client.requests.get") as mocked_req: + with patch("ska.skuid.client.requests.get") as mocked_req: response = MagicMock() response.json.side_effect = [ json.dumps({"transaction_id": 1}), -- GitLab