Commit ba867c87 authored by Vasyl Bodnaruk's avatar Vasyl Bodnaruk

Change take data for log file

parent d769ea69
from datetime import datetime from datetime import datetime
import io
from urllib.request import urlopen from urllib.request import urlopen
from scrapyd_api import ScrapydAPI from scrapyd_api import ScrapydAPI
from .models import Job from .models import Job
......
import io
from datetime import datetime, time from datetime import datetime, time
from django.shortcuts import render, HttpResponseRedirect, reverse, HttpResponse from django.shortcuts import render, HttpResponseRedirect, reverse, HttpResponse
from django.http import JsonResponse, FileResponse from django.http import JsonResponse, FileResponse
...@@ -22,6 +21,11 @@ class JobListView(ListView): ...@@ -22,6 +21,11 @@ class JobListView(ListView):
super(JobListView, self).__init__() super(JobListView, self).__init__()
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
action = request.GET.get('action')
job_id = request.GET.get('id')
if action:
log = self.service.get_log(job_id)
return HttpResponse(log, content_type='text/plain')
self.service.update_jobs_status() self.service.update_jobs_status()
j = Job.objects.all().order_by('-create_time') j = Job.objects.all().order_by('-create_time')
jobs = { jobs = {
...@@ -55,7 +59,7 @@ class JobListView(ListView): ...@@ -55,7 +59,7 @@ class JobListView(ListView):
if action == 'restart': if action == 'restart':
return JsonResponse(self.service.restart_job(job_id)) return JsonResponse(self.service.restart_job(job_id))
if action == 'log': if action == 'log':
log = io.BytesIO(self.service.get_log(job_id)) log = self.service.get_log(job_id)
# return HttpResponse(log, content_type='text/plain') # return HttpResponse(log, content_type='text/plain')
return FileResponse(log) return FileResponse(log)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment