From 850f97eefa11e52a4a802eaada720f692cda6264 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Mon, 11 Oct 2021 16:29:36 -0700 Subject: spn: avoid 'None' job_id Thanks Vanglis for reporting these. Not sure this commit fixes *all* instances of the problem. --- python/sandcrawler/ia.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'python/sandcrawler') diff --git a/python/sandcrawler/ia.py b/python/sandcrawler/ia.py index c586972..0c3f621 100644 --- a/python/sandcrawler/ia.py +++ b/python/sandcrawler/ia.py @@ -864,7 +864,7 @@ class SavePageNowClient: if resp_json and 'message' in resp_json and 'You have already reached the limit of active sessions' in resp_json['message']: raise SavePageNowBackoffError(resp_json['message']) - elif not resp_json or 'job_id' not in resp_json: + elif not resp_json or 'job_id' not in resp_json or not resp_json['job_id']: raise SavePageNowError( "Didn't get expected 'job_id' field in SPN2 response: {}".format(resp_json)) @@ -874,7 +874,7 @@ class SavePageNowClient: # poll until complete final_json = None for i in range(self.poll_count): - resp = self.v2_session.get("{}/status/{}".format(self.v2endpoint, resp_json['job_id'])) + resp = self.v2_session.get("{}/status/{}".format(self.v2endpoint, job_id)) try: resp.raise_for_status() except: -- cgit v1.2.3