A set of minor improvements

RedOakMark · Feb 7, 2015 · af9ad64 · af9ad64
1 parent fdaad83
commit af9ad64
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/TODO.md b/TODO.md
@@ -20,9 +20,16 @@ TODO
 
 #### Macros
 * Previous execution timestamp
+* Previous ds
 * ...
 
+#### Frontend
+* Graph view: color coding by operator + legend
+
 #### Backend
+* Callbacks
+* Set default args at the DAG level?
+* Prevent timezone chagne on import
 * Add decorator to timeout imports on master process [lib](https://github.com/pnpnpn/timeout-decorator)
 * Mysql port should carry through (using default now)
 * Make authentication universal

diff --git a/airflow/models.py b/airflow/models.py
@@ -673,10 +673,12 @@ def render_templates(self):
 
     def email_alert(self, exception, is_retry=False):
         task = self.task
-        title = "AirFlow alert: {self}".format(**locals())
+        title = "Airflow alert: {self}".format(**locals())
+        exception = exception.replace('\n', '<br>')
+        try_ = task.retries + 1
         body = (
-            "Try {self.try_number} out of {task.retries}<br>"
-            "Exception:<br>{exception}"
+            "Try {self.try_number} out of {try_}<br>"
+            "Exception:<br>{exception}<br>"
             "Log: <a href='{self.log_url}'>Link</a><br>"
             "Host: {self.hostname}<br>"
             "Log file: {self.log_filepath}<br>"

diff --git a/airflow/www/app.py b/airflow/www/app.py
@@ -188,7 +188,7 @@ class QueryForm(Form):
         session.close()
         return self.render(
             'airflow/query.html', form=form,
-            title="Query",
+            title="Ad Hoc Query",
             results=results or '',
             has_data=has_data)
 
@@ -462,7 +462,7 @@ def chart(self):
         response = self.render(
             'airflow/highchart.html',
             chart=chart,
-            title="Chart",
+            title="Airflow - Chart",
             sql=sql,
             label=chart.label)
         session.commit()
@@ -529,7 +529,7 @@ def circles(self):
     @login_required
     def conf(self):
         from airflow import configuration
-        title = "Application Configuration"
+        title = "Airflow Configuration"
         subtitle = configuration.AIRFLOW_CONFIG
         f = open(configuration.AIRFLOW_CONFIG, 'r')
 

diff --git a/airflow/www/templates/admin/master.html b/airflow/www/templates/admin/master.html
@@ -17,6 +17,6 @@
 	style="float: left; width:35px; margin-top: -7px;"
         src="{{ url_for("static", filename="pin_100.png") }}"
         title="{{ current_user.username }}">
-  <span>AirFlow</span>
+  <span>Airflow</span>
 </a>
 {% endblock %}
diff --git a/airflow/www/templates/airflow/code.html b/airflow/www/templates/airflow/code.html
@@ -1,5 +1,9 @@
 {% extends "airflow/master.html" %}
 
+{% block title %}
+    {{ title }}
+{% endblock %}
+
 {% block body %}
     {{ super() }}
     <h2>{{ title }}</h2>
@@ -10,6 +14,7 @@ <h5>{{ subtitle }}</h5>
     {% if code %}
         <pre>{{ code }}</pre>
     {% endif %}
+
     {% if code_html %}
         {{ code_html|safe }}
     {% endif %}