r39132 closed pull request #3999: [AIRFLOW-3161] Fix TaskInstance log link in
RBAC UI
URL: https://github.com/apache/incubator-airflow/pull/3999
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/airflow/models.py b/airflow/models.py
index 6154ca64f4..c77f879b0f 100755
--- a/airflow/models.py
+++ b/airflow/models.py
@@ -1121,10 +1121,10 @@ def log_url(self):
BASE_URL = configuration.conf.get('webserver', 'BASE_URL')
if settings.RBAC:
return BASE_URL + (
- "/log/list/"
- "?_flt_3_dag_id={self.dag_id}"
- "&_flt_3_task_id={self.task_id}"
- "&_flt_3_execution_date={iso}"
+ "/log?"
+ "execution_date={iso}"
+ "&task_id={self.task_id}"
+ "&dag_id={self.dag_id}"
).format(**locals())
else:
return BASE_URL + (
diff --git a/tests/models.py b/tests/models.py
index 999b1be1bb..865ebff422 100644
--- a/tests/models.py
+++ b/tests/models.py
@@ -2298,6 +2298,20 @@ def test_log_url(self):
self.assertEqual(d['task_id'][0], 'op')
self.assertEqual(pendulum.parse(d['execution_date'][0]), now)
+ @patch('airflow.settings.RBAC', True)
+ def test_log_url_rbac(self):
+ dag = DAG('dag', start_date=DEFAULT_DATE)
+ task = DummyOperator(task_id='op', dag=dag)
+ ti = TI(task=task, execution_date=datetime.datetime(2018, 1, 1))
+
+ expected_url = (
+ 'http://localhost:8080/log?'
+ 'execution_date=2018-01-01T00%3A00%3A00%2B00%3A00'
+ '&task_id=op'
+ '&dag_id=dag'
+ )
+ self.assertEqual(ti.log_url, expected_url)
+
def test_mark_success_url(self):
now = pendulum.now('Europe/Brussels')
dag = DAG('dag', start_date=DEFAULT_DATE)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
