From 846f6b02fa286124e71222c1d2a93cb2e06f51d2 Mon Sep 17 00:00:00 2001
From: Martijn Vermaat <martijn@vermaat.name>
Date: Mon, 9 Nov 2015 10:55:54 +0100
Subject: [PATCH] Store interface when submitting batch job without email
---
mutalyzer/Scheduler.py | 6 +++---
mutalyzer/services/rpc.py | 2 +-
mutalyzer/website/views.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mutalyzer/Scheduler.py b/mutalyzer/Scheduler.py
index 339d1ef5..96db9f07 100644
--- a/mutalyzer/Scheduler.py
+++ b/mutalyzer/Scheduler.py
@@ -98,9 +98,9 @@ class Scheduler() :
if settings.TESTING:
return
- # 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'):
+ # Mail is set to '<IP ADDRESS>@<INTERFACE>.mutalyzer' if the batch job
+ # was submitted without specifying an email address.
+ if mailTo.endswith('.mutalyzer'):
return
#TODO: Handle Connection errors in a try, except clause
diff --git a/mutalyzer/services/rpc.py b/mutalyzer/services/rpc.py
index 3d3570ed..4c9e5fdf 100644
--- a/mutalyzer/services/rpc.py
+++ b/mutalyzer/services/rpc.py
@@ -155,7 +155,7 @@ class MutalyzerService(ServiceBase):
address = unicode(ctx.transport.req_env['REMOTE_ADDR'])
except (AttributeError, KeyError):
address = 'localhost'
- email = '%s@webservice' % address
+ email = '%s@webservice.mutalyzer' % address
result_id = scheduler.addJob(email, job, columns,
batch_types[process], argument)
diff --git a/mutalyzer/website/views.py b/mutalyzer/website/views.py
index 1786c201..f3814c31 100644
--- a/mutalyzer/website/views.py
+++ b/mutalyzer/website/views.py
@@ -907,7 +907,7 @@ def batch_jobs_submit():
errors = []
if not email:
- email = '{}@webservice'.format(request.remote_addr)
+ email = '{}@website.mutalyzer'.format(request.remote_addr)
if job_type not in BATCH_JOB_TYPES:
errors.append('Invalid batch job type.')
--
GitLab