Skip to content

47-joblogs-path #51

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

Merged
wvengen merged 2 commits into from
Apr 1, 2025
Merged

47-joblogs-path #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d6afcd
extract spider and project names from the labels of a job pod and pas…
vlerkin Apr 1, 2025
3fe226f
change a directory for local logs in manifest; remove debug logs
vlerkin Apr 1, 2025
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
2 changes: 1 addition & 1 deletion kubernetes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ data:
env_config = spider-example-env
repository = ghcr.io/q-m/scrapyd-k8s-spider-example

# It is strongly recomended to set resource requests and limits on production.
# It is strongly recommended to set resource requests and limits on production.
# They can be overridden on the project and spider level.
[default.resources]
requests_cpu = 0.2
Expand Down
4 changes: 3 additions & 1 deletion scrapyd_k8s/joblogs/log_handler_k8s.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ def handle_events(self, event):
if pod.metadata.labels.get("org.scrapy.job_id"):
job_id = pod.metadata.labels.get("org.scrapy.job_id")
pod_name = pod.metadata.name
spider = pod.metadata.labels.get("org.scrapy.spider")
project = pod.metadata.labels.get("org.scrapy.project")
thread_name = f"{self.namespace}_{pod_name}"
if pod.status.phase == 'Running':
if (thread_name in self.watcher_threads
Expand All @@ -290,7 +292,7 @@ def handle_events(self, event):
logger.info(
f"Removed local log file '{log_filename}' since it already exists in storage.")
else:
self.object_storage_provider.upload_file(log_filename)
self.object_storage_provider.upload_file(project, spider, log_filename)
os.remove(log_filename)
logger.info(f"Removed local log file '{log_filename}' after successful upload.")
else:
Expand Down
12 changes: 9 additions & 3 deletions scrapyd_k8s/object_storage/libcloud_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from libcloud.storage.providers import get_driver

logger = logging.getLogger(__name__)
logging.basicConfig(level=logging.DEBUG)

class LibcloudObjectStorage:
"""
Expand Down Expand Up @@ -113,14 +114,18 @@ def replace_var(match):
result = result.replace(r'\${', '${')
return result

def upload_file(self, local_path):
def upload_file(self, project, spider, local_path):
"""
Uploads a file to the object storage container.

Parameters
----------
local_path : str
The local file path of the file to be uploaded.
The job_id that is passed as a local path.
project : str
The name of the project.
spider : str
The name of the spider.

Returns
-------
Expand All @@ -130,7 +135,8 @@ def upload_file(self, local_path):
----
Logs information about the upload status or errors encountered.
"""
object_name = os.path.basename(local_path)
job_id = os.path.basename(local_path).replace('.txt', '')
object_name = f"logs/{project}/{spider}/{job_id}.log"
try:
container = self.driver.get_container(container_name=self._container_name)
self.driver.upload_object(
Expand Down
Loading