Skip to content

Fix job status not updating when spider_closed fails #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erick-GeGe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix job status not updating when spider_closed fails #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 37 additions & 26 deletions estela_scrapy/extensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

RUNNING_STATUS = "RUNNING"
COMPLETED_STATUS = "COMPLETED"
ERROR_STATUS = "ERROR"

# Performance optimization constants
TIME_CACHE_UPDATE_INTERVAL = 100 # Update time calculation every N items
Expand Down Expand Up @@ -355,37 +356,47 @@ def spider_closed(self, spider, reason):
if self.task.running:
self.task.stop()

metrics, elapsed_time = self._calculate_metrics(spider, status=reason)

stats = self.stats.get_stats()
stats.update({"elapsed_time_seconds": int(elapsed_time)})
stats.update(metrics)

try:
self.redis_conn.delete(self.stats_key)
except Exception:
pass

update_job(
self.job_url,
self.auth_token,
status=COMPLETED_STATUS,
lifespan=int(stats.get("elapsed_time_seconds", 0)),
total_bytes=stats.get("downloader/response_bytes", 0),
item_count=stats.get("item_scraped_count", 0),
request_count=stats.get("downloader/request_count", 0),
proxy_usage_data={
"proxy_name": stats.get("downloader/proxy_name", ""),
"bytes": stats.get("downloader/proxies/response_bytes", 0),
},
)

parsed_stats = json.dumps(stats, default=json_serializer)
data = {
"jid": os.getenv("ESTELA_SPIDER_JOB"),
"payload": json.loads(parsed_stats),
}
producer.send("job_stats", data)
try:
# Put all new code here
metrics, elapsed_time = self._calculate_metrics(spider, status=reason)
stats = self.stats.get_stats()
stats.update({"elapsed_time_seconds": int(elapsed_time)})
stats.update(metrics)

parsed_stats = json.dumps(stats, default=json_serializer)
data = {
"jid": os.getenv("ESTELA_SPIDER_JOB"),
"payload": json.loads(parsed_stats),
}
producer.send("job_stats", data)
job_status = COMPLETED_STATUS

except Exception as e:
print(f"Error during spider_closed: {e}")
job_status = ERROR_STATUS

finally:
try:
update_job(
self.job_url,
self.auth_token,
status=job_status,
lifespan=int(stats.get("elapsed_time_seconds", 0)),
total_bytes=stats.get("downloader/response_bytes", 0),
item_count=stats.get("item_scraped_count", 0),
request_count=stats.get("downloader/request_count", 0),
proxy_usage_data={
"proxy_name": stats.get("downloader/proxy_name", ""),
"bytes": stats.get("downloader/proxies/response_bytes", 0),
},
)
except Exception as e:
print(f"CRITICAL ERROR: Could not update job status: {e}")

def store_stats(self, spider):
metrics, elapsed_time = self._calculate_metrics(
Expand Down