Skip to content
This repository has been archived by the owner on Nov 17, 2022. It is now read-only.

Commit

Permalink
removes calls to status endpoint (#61)
Browse files Browse the repository at this point in the history
status endpoint does not exist any more.
Co-authored-by: Ilija Vukotic <ivukotic@cern.ch>
  • Loading branch information
ivukotic authored Nov 9, 2022
1 parent 56530b8 commit a1c1091
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 61 deletions.
20 changes: 0 additions & 20 deletions servicex/transformer/servicex_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import datetime
import logging
import os

import requests

from retry.api import retry_call
Expand Down Expand Up @@ -56,23 +53,6 @@ def __init__(self, servicex_endpoint, logger=None):
backoff_factor=0.1)
self.session.mount('http://', HTTPAdapter(max_retries=retries))

def post_status_update(self, file_id, status_code, info):
doc = {
"timestamp": datetime.datetime.now().isoformat(),
"status-code": status_code,
"pod-name": os.environ['POD_NAME'],
"info": info
}

try:
retry_call(self.session.post,
fargs=[self.server_endpoint + "/" + str(file_id) + "/status"],
fkwargs={"data": doc},
tries=MAX_RETRIES,
delay=RETRY_DELAY)
except requests.exceptions.ConnectionError:
self.logger.exception("Connection Error in post_status_update")

def put_file_complete(self, file_path, file_id, status,
num_messages=None, total_time=None, total_events=None,
total_bytes=None):
Expand Down
41 changes: 0 additions & 41 deletions servicex/transformer/tests/test_servicex_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,44 +85,3 @@ def test_put_file_complete_retry(self, mocker, caplog):
assert caplog.records[0].msg == "Put file complete."
assert caplog.records[1].levelno == logging.WARNING
assert caplog.records[1].msg == '%s, retrying in %s seconds...'

def test_post_status_update(self, mocker, caplog):
import requests
import os
mocker.patch.dict(os.environ, {"POD_NAME": "my-pod"})
caplog.set_level(logging.INFO)

mock_session = mocker.MagicMock(requests.session)
mock_session.mount = mocker.Mock()
mock_session.post = mocker.Mock()
mocker.patch('requests.session', return_value=mock_session)

adapter = ServiceXAdapter("http://foo.com")
adapter.post_status_update(42, "testing", "this is a test")
mock_session.post.assert_called()
args = mock_session.post.call_args
assert args[0][0] == 'http://foo.com/42/status'
doc = args[1]['data']
assert doc['status-code'] == 'testing'
assert doc['info'] == 'this is a test'
assert doc['pod-name'] == 'my-pod'
assert len(caplog.records) == 0

def test_post_status_update_retry(self, mocker, caplog):
import requests
import os
mocker.patch.dict(os.environ, {"POD_NAME": "my-pod"})
caplog.set_level(logging.INFO)

mock_session = mocker.MagicMock(requests.session)
mock_session.mount = mocker.Mock()
mock_session.post = mocker.Mock(
side_effect=[requests.exceptions.ConnectionError, 200])
mocker.patch('requests.session', return_value=mock_session)

adapter = ServiceXAdapter("http://foo.com")
adapter.post_status_update(42, "testing", "this is a test")
assert mock_session.post.call_count == 2
assert len(caplog.records) == 1
assert caplog.records[0].levelno == logging.WARNING
assert caplog.records[0].msg == '%s, retrying in %s seconds...'

0 comments on commit a1c1091

Please sign in to comment.