Skip to content
This repository has been archived by the owner on Jul 8, 2021. It is now read-only.

Commit

Permalink
scheduler, task_pool, task_proxy refactor
Browse files Browse the repository at this point in the history
Fixes following merge with cylc#2276.
  • Loading branch information
matthewrmshin committed May 11, 2017
1 parent 0a0b18f commit 362901e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 0 additions & 3 deletions lib/cylc/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
from parsec.OrderedDict import OrderedDictWithDefaults
from parsec.util import replicate
from cylc.suite_logging import OUT, ERR
from cylc.task_proxy import TaskProxy


RE_SUITE_NAME_VAR = re.compile('\${?CYLC_SUITE_(REG_)?NAME}?')
Expand Down Expand Up @@ -749,8 +748,6 @@ def __init__(self, suite, fpath, template_vars=None,
'(graph the suite to see back-edges).')

self.mem_log("config.py: end init config")
TaskProxy.suite_name = self.suite
TaskProxy.suite_url = self.cfg['URL']

def _expand_name_list(self, orig_names):
"""Expand any parameters in lists of names."""
Expand Down
1 change: 1 addition & 0 deletions lib/cylc/scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ def configure(self):
self.task_events_mgr.mail_interval = self._get_cylc_conf(
"task event mail interval")
self.task_events_mgr.mail_footer = self._get_events_conf("mail footer")
self.task_events_mgr.suite_url = self.config.cfg['URL']
if self.options.genref or self.options.reftest:
self.configure_reftest()

Expand Down
3 changes: 3 additions & 0 deletions lib/cylc/task_events_mgr.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ class TaskEventsManager(object):

def __init__(self, suite, proc_pool, suite_db_mgr):
self.suite = suite
self.suite_url = None
self.proc_pool = proc_pool
self.suite_db_mgr = suite_db_mgr
self.mail_interval = 0.0
Expand Down Expand Up @@ -826,6 +827,8 @@ def _setup_custom_event_handlers(self, itask, event, message):
"submit_num": itask.submit_num,
"id": quote(itask.identity),
"message": quote(message),
"task_url": quote(itask.tdef.rtconfig['URL']),
"suite_url": quote(self.suite_url),
}
if cmd == handler:
# Nothing substituted, assume classic interface
Expand Down

0 comments on commit 362901e

Please sign in to comment.