From 7d18a1d38459df9f304aee504e03267bf355d634 Mon Sep 17 00:00:00 2001 From: Simon Ebner Date: Tue, 11 Dec 2018 15:58:27 +0100 Subject: [PATCH] increase timeout increase logging --- cadump/cadump.py | 5 ++++- conda-recipe/meta.yaml | 2 +- setup.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cadump/cadump.py b/cadump/cadump.py index 075590e..3cb49f0 100644 --- a/cadump/cadump.py +++ b/cadump/cadump.py @@ -92,6 +92,8 @@ def get_pulse_id_date_mapping(pulse_ids): "fields": ["pulseId", "globalDate"]} for c in range(1): + + logger.info("Retrieve mapping for pulse_id %d" % pulse_id) # Query server response = requests.post("https://data-api.psi.ch/sf/query", json=query) @@ -102,6 +104,7 @@ def get_pulse_id_date_mapping(pulse_ids): data = response.json() if not pulse_id == data[0]["data"][0]["pulseId"]: + logger.info("retrieval failed") if c == 0: ref_date = data[0]["data"][0]["globalDate"] ref_date = dateutil.parser.parse(ref_date) @@ -109,7 +112,7 @@ def get_pulse_id_date_mapping(pulse_ids): now_date = datetime.datetime.now() now_date = pytz.timezone('Europe/Zurich').localize(now_date) - check_date = ref_date+datetime.timedelta(seconds=20) + check_date = ref_date+datetime.timedelta(seconds=24) # 20 seconds should be enough delta_date = check_date - now_date s = delta_date.seconds diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index f1055c6..b1ce859 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,6 +1,6 @@ package: name: cadump - version: 0.0.5 + version: 0.0.6 source: path: .. diff --git a/setup.py b/setup.py index 688de20..3b82973 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup( name="cadump", - version="0.0.5", + version="0.0.6", author="Paul Scherrer Institute", author_email="daq@psi.ch", description="Interface to dump data from archiver/databuffer",