Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mutalyzer
mutalyzer2
Commits
05ad5b87
Commit
05ad5b87
authored
Nov 03, 2015
by
Vermaat
Browse files
Group batch jobs by client IP if email address is missing
parent
4c1baaef
Changes
2
Hide whitespace changes
Inline
Side-by-side
mutalyzer/Scheduler.py
View file @
05ad5b87
...
...
@@ -97,9 +97,9 @@ class Scheduler() :
if
settings
.
TESTING
:
return
# Mail is set to '
job
@webservice' if the batch job was
submitted using
#
the webservice
.
if
mailTo
==
'job
@webservice'
:
# Mail is set to '
<IP ADDRESS>
@webservice' if the batch job was
#
submitted using the webservice without specifying an email address
.
if
mailTo
.
endswith
(
'
@webservice'
)
:
return
#TODO: Handle Connection errors in a try, except clause
...
...
mutalyzer/services/rpc.py
View file @
05ad5b87
...
...
@@ -12,7 +12,7 @@ Mutalyzer RPC services.
from
__future__
import
unicode_literals
import
binning
from
spyne.decorator
import
srpc
from
spyne.decorator
import
rpc
,
srpc
from
spyne.service
import
ServiceBase
from
spyne.model.primitive
import
Integer
,
Boolean
,
DateTime
,
Unicode
from
spyne.model.complex
import
Array
...
...
@@ -71,8 +71,8 @@ class MutalyzerService(ServiceBase):
super
(
MutalyzerService
,
self
).
__init__
(
environ
)
#__init__
@
s
rpc
(
Mandatory
.
ByteArray
,
Unicode
,
Unicode
,
Unicode
,
_returns
=
Unicode
)
def
submitBatchJob
(
data
,
process
=
'NameChecker'
,
argument
=
''
,
email
=
None
):
@
rpc
(
Mandatory
.
ByteArray
,
Unicode
,
Unicode
,
Unicode
,
_returns
=
Unicode
)
def
submitBatchJob
(
ctx
,
data
,
process
=
'NameChecker'
,
argument
=
''
,
email
=
None
):
"""
Submit a batch job.
...
...
@@ -80,10 +80,10 @@ class MutalyzerService(ServiceBase):
website <https://mutalyzer.nl/batch>.
Batch jobs are processed using round-robin scheduling grouped by email
address
. Per email address, jobs are processed sequentially in ord
er
of submission. Jobs with no email address specified end up in a shared
group.
This means you
r job is likely to be
pro
c
ess
ed sooner if
you
provide an email address
.
address
(or client IP address if no email address is specified). P
er
email address, jobs are processed sequentially in order of submission.
This means you
will not see any
pro
gr
ess
on this job until all
you
r
earlier jobs have finished
.
On error an exception is raised:
- detail: Human readable description of the error.
...
...
@@ -147,7 +147,17 @@ class MutalyzerService(ServiceBase):
if
job
is
None
:
raise
Fault
(
'EPARSE'
,
'Could not parse input file, please check your file format.'
)
result_id
=
scheduler
.
addJob
(
email
or
'job@webservice'
,
job
,
columns
,
if
not
email
:
# If no email address is specified, we create a fake one based on
# the caller's IP address. This makes sure the scheduler processes
# jobs grouped by user.
try
:
address
=
unicode
(
ctx
.
transport
.
req_env
[
'REMOTE_ADDR'
])
except
(
AttributeError
,
KeyError
):
address
=
'localhost'
email
=
'%s@webservice'
%
address
result_id
=
scheduler
.
addJob
(
email
,
job
,
columns
,
batch_types
[
process
],
argument
)
return
result_id
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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