From 4c059c900799e2878888ebd7a1242d92086af11c Mon Sep 17 00:00:00 2001 From: Raimon Esteve Date: Thu, 24 Nov 2016 17:31:43 +0100 Subject: [PATCH] APM faulthandler from cfg file Register faulthandler in case apm options is True because some other process get AttributeError fileno (celery) --- top.diff | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/top.diff b/top.diff index 7a76ba2..ab85a16 100644 --- a/top.diff +++ b/top.diff @@ -39,13 +39,16 @@ diff -r 649b0805fa93 trytond/protocols/dispatcher.py diff -r 649b0805fa93 trytond/protocols/top.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/trytond/trytond/protocols/top.py Sun Apr 19 03:18:20 2015 +0200 -@@ -0,0 +1,90 @@ +@@ -0,0 +1,94 @@ +import random +import signal +import locale +import faulthandler +from operator import itemgetter +from datetime import datetime ++from trytond.config import config as config_ ++ ++APM = config_.getboolean('optional', 'apm', default=True) + +current_actions = {} +action_id = 0 @@ -113,8 +116,9 @@ diff -r 649b0805fa93 trytond/protocols/top.py + pprint_table(table) + print '=' * 30 + -+signal.signal(signal.SIGUSR1, signal_user_handler) -+faulthandler.register(signal.SIGUSR2) ++if APM: ++ signal.signal(signal.SIGUSR1, signal_user_handler) ++ faulthandler.register(signal.SIGUSR2) + + +def add(value):