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
a0a814c6
Commit
a0a814c6
authored
Jul 13, 2017
by
Vasyl Bodnaruk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor service for interact with scrapyd
parent
29abd37e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
10 deletions
+14
-10
service.py
esi/scraper/service.py
+14
-10
No files found.
esi/scraper/service.py
View file @
a0a814c6
...
...
@@ -3,6 +3,10 @@ from urllib.request import urlopen
from
scrapyd_api
import
ScrapydAPI
from
.models
import
Job
PROJECT
=
'exa'
SCRAPYD_HOST
=
'http://127.0.0.1:6800'
LOG_PATH
=
'/logs/'
+
PROJECT
class
Service
:
...
...
@@ -11,11 +15,11 @@ class Service:
def
update_jobs_status
(
self
):
try
:
jobs
=
self
.
api
.
list_jobs
(
'exa'
)
jobs
=
self
.
api
.
list_jobs
(
PROJECT
)
finished
=
jobs
.
get
(
'finished'
)
if
finished
:
for
i
in
finished
:
Job
.
objects
.
filter
(
job_uuid
=
i
[
'id'
],
status
=
'RUN'
)
.
update
(
status
=
'FIN'
,
end_time
=
i
[
'end_time'
])
Job
.
objects
.
filter
(
job_uuid
=
i
[
'id'
],
status
=
Job
.
RUNNING
)
.
update
(
status
=
Job
.
FINISHED
,
end_time
=
i
[
'end_time'
])
except
:
pass
...
...
@@ -23,21 +27,21 @@ class Service:
job
=
Job
.
objects
.
get
(
pk
=
job
)
job
.
job_uuid
=
self
.
_run
(
job
)
job
.
start_time
=
datetime
.
now
()
job
.
status
=
'RUN'
job
.
status
=
Job
.
RUNNING
job
.
save
()
return
job
.
json
()
def
cancel_job
(
self
,
job
):
job
=
Job
.
objects
.
get
(
pk
=
job
)
self
.
api
.
cancel
(
'exa'
,
job
.
job_uuid
)
self
.
api
.
cancel
(
PROJECT
,
job
.
job_uuid
)
job
.
end_time
=
datetime
.
now
()
job
.
status
=
'FIN'
job
.
status
=
Job
.
FINISHED
job
.
save
()
return
job
.
json
()
def
delete_job
(
self
,
job
):
job
=
Job
.
objects
.
get
(
pk
=
job
)
job
.
status
=
'DEL'
job
.
status
=
Job
.
DELETE
job
.
save
()
return
job
.
json
()
...
...
@@ -45,7 +49,7 @@ class Service:
job
=
Job
.
objects
.
get
(
pk
=
job
)
job
.
start_time
=
None
job
.
end_time
=
None
job
.
status
=
'PEN'
job
.
status
=
Job
.
PENDING
job
.
save
()
return
job
.
json
()
...
...
@@ -54,16 +58,16 @@ class Service:
job
.
job_uuid
=
self
.
_run
(
job
)
job
.
start_time
=
datetime
.
now
()
job
.
end_time
=
None
job
.
status
=
'RUN'
job
.
status
=
Job
.
RUNNING
job
.
save
()
return
job
.
json
()
def
get_log
(
self
,
job
):
job
=
Job
.
objects
.
get
(
pk
=
job
)
url
=
'http://127.0.0.1:6800/logs/exa
/{}/{}.log'
.
format
(
job
.
spider
.
sp_name
,
job
.
job_uuid
)
url
=
SCRAPYD_HOST
+
LOG_PATH
+
'
/{}/{}.log'
.
format
(
job
.
spider
.
sp_name
,
job
.
job_uuid
)
response
=
urlopen
(
url
)
return
response
.
read
()
def
_run
(
self
,
job
):
return
self
.
api
.
schedule
(
'exa'
,
job
.
spider
.
sp_name
,
query
=
job
.
query
)
return
self
.
api
.
schedule
(
PROJECT
,
job
.
spider
.
sp_name
,
query
=
job
.
query
)
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