Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
E
esi-table-data
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
esi-data-scrapping
esi-table-data
Commits
ba867c87
Commit
ba867c87
authored
Jul 11, 2017
by
Vasyl Bodnaruk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change take data for log file
parent
d769ea69
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
service.py
esi/scraper/service.py
+1
-0
views.py
esi/scraper/views.py
+6
-2
No files found.
esi/scraper/service.py
View file @
ba867c87
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
...
...
esi/scraper/views.py
View file @
ba867c87
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment