|
@@ -569,13 +569,13 @@ class LinkJobLogs(object):
|
|
|
@classmethod
|
|
@classmethod
|
|
|
def _make_mr_links(cls, log):
|
|
def _make_mr_links(cls, log):
|
|
|
escaped_logs = escape(log)
|
|
escaped_logs = escape(log)
|
|
|
- return re.sub('(job_[0-9_]+(/|\.)?)', LinkJobLogs._replace_mr_link, escaped_logs)
|
|
|
|
|
|
|
+ return re.sub('(job_[0-9]{12}_[0-9]+)', LinkJobLogs._replace_mr_link, escaped_logs)
|
|
|
|
|
|
|
|
@classmethod
|
|
@classmethod
|
|
|
def _make_links(cls, log):
|
|
def _make_links(cls, log):
|
|
|
escaped_logs = escape(log)
|
|
escaped_logs = escape(log)
|
|
|
hdfs_links = re.sub('((?<= |;)/|hdfs://)[^ <&\t;,\n]+', LinkJobLogs._replace_hdfs_link, escaped_logs)
|
|
hdfs_links = re.sub('((?<= |;)/|hdfs://)[^ <&\t;,\n]+', LinkJobLogs._replace_hdfs_link, escaped_logs)
|
|
|
- return re.sub('(job_[0-9_]+(/|\.)?)', LinkJobLogs._replace_mr_link, hdfs_links)
|
|
|
|
|
|
|
+ return re.sub('(job_[0-9]{12}_[0-9]+)', LinkJobLogs._replace_mr_link, hdfs_links)
|
|
|
|
|
|
|
|
@classmethod
|
|
@classmethod
|
|
|
def _replace_hdfs_link(self, match):
|
|
def _replace_hdfs_link(self, match):
|