You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by bo...@apache.org on 2016/12/29 16:16:38 UTC
[2/3] incubator-airflow git commit: Log needs to be part of try/catch
block
Log needs to be part of try/catch block
Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/9de7762d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/9de7762d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/9de7762d
Branch: refs/heads/master
Commit: 9de7762d468378014c7221e8e2fabffe88fd9abc
Parents: b95a615
Author: Bolke de Bruin <bo...@Bolkes-MacBook-Pro.local>
Authored: Thu Dec 29 16:52:31 2016 +0100
Committer: Bolke de Bruin <bo...@Bolkes-MacBook-Pro.local>
Committed: Thu Dec 29 16:52:31 2016 +0100
----------------------------------------------------------------------
airflow/utils/helpers.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/9de7762d/airflow/utils/helpers.py
----------------------------------------------------------------------
diff --git a/airflow/utils/helpers.py b/airflow/utils/helpers.py
index 23fda03..6bd7a64 100644
--- a/airflow/utils/helpers.py
+++ b/airflow/utils/helpers.py
@@ -208,9 +208,9 @@ def kill_descendant_processes(logger, pids_to_kill=None):
temp_processes = descendant_processes[:]
for descendant in temp_processes:
- logger.warn("Terminating descendant process {} PID: {}"
- .format(descendant.cmdline(), descendant.pid))
try:
+ logger.warn("Terminating descendant process {} PID: {}"
+ .format(descendant.cmdline(), descendant.pid))
descendant.terminate()
except psutil.NoSuchProcess:
descendant_processes.remove(descendant)