Return-Path: Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) by mail.openembedded.org (Postfix) with ESMTP id 02E0D6A5A0 for ; Wed, 29 May 2013 03:53:03 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.14.5/8.14.3) with ESMTP id r4T3r7cE001301 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Tue, 28 May 2013 20:53:07 -0700 (PDT) Received: from msp-mhatle-lx2.wrs.com (172.25.34.61) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server (TLS) id 14.2.342.3; Tue, 28 May 2013 20:53:05 -0700 From: Mark Hatle To: Date: Tue, 28 May 2013 22:59:13 -0500 Message-ID: <1369799955-1488-5-git-send-email-mark.hatle@windriver.com> X-Mailer: git-send-email 1.8.1.2.545.g2f19ada In-Reply-To: <1369799955-1488-1-git-send-email-mark.hatle@windriver.com> References: <1369799955-1488-1-git-send-email-mark.hatle@windriver.com> MIME-Version: 1.0 X-Originating-IP: [172.25.34.61] Subject: [PATCH 5/7] knotty.py: Add interactive commands to knotty X-BeenThere: bitbake-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 May 2013 03:53:04 -0000 Content-Type: text/plain From: Jason Wessel 0 - Linear logging 1 - turn off real time log tail 2 - turn on real time log tail 3 - turn on debug logging 4 - turn on debug logging and real time log tail t - Display tasks in "top" mode N - Display all runtime NOTE's that are normally filtered (0 or 1 toggles off) h - display commands The knotty 2 functionality can be activated in realtime by pressing "t" for top mode or reverted with "0" for normal mode. Signed-off-by: Jason Wessel --- lib/bb/ui/knotty.py | 78 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 68 insertions(+), 10 deletions(-) diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index 5020815..d1ee534 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -97,7 +97,7 @@ class InteractConsoleLogFilter(logging.Filter): self.format = format def filter(self, record): - if record.levelno == self.format.NOTE and (record.msg.startswith("Running") or record.msg.startswith("recipe ")): + if self.tf.filterOn and record.levelno == self.format.NOTE and (record.msg.startswith("Running") or record.msg.startswith("recipe ")): return False self.tf.clearFooter() return True @@ -136,6 +136,8 @@ class TerminalFilter(object): self.main = main self.helper = helper self.cuu = None + self.topMode = False + self.filterOn = False self.stdinbackup = None self.interactive = sys.stdout.isatty() self.footer_present = False @@ -172,9 +174,31 @@ class TerminalFilter(object): self.columns = self.getTerminalColumns() except: self.cuu = None + self.topMode = True + self.filterOn = True console.addFilter(InteractConsoleLogFilter(self, format)) + def setTopMode(self): + if self.topMode: + return + self.topMode = True + self.setFilterOn() + + def setNormalMode(self): + if not self.topMode: + return + self.topMode = False + self.setFilterOff() + + def setFilterOn(self): + self.filterOn = True + + def setFilterOff(self): + self.filterOn = False + def clearFooter(self): + if not self.topMode: + return if self.footer_present: lines = self.footer_present sys.stdout.write(self.curses.tparm(self.cuu, lines)) @@ -186,7 +210,7 @@ class TerminalFilter(object): self.updateFooter() def updateFooter(self): - if not self.cuu: + if not self.cuu or not self.topMode: return activetasks = self.helper.running_tasks failedtasks = self.helper.failed_tasks @@ -252,23 +276,29 @@ class StdinMgr: self.termios.tcsetattr(self.fd, self.termios.TCSANOW, new) class RtLogLevel: - def __init__(self, handler, logfilter, mlt): + def __init__(self, handler, logfilter, mlt, tf): self.displaytail = False self.handler = handler self.logfilter = logfilter self.defaultLevel = logfilter.getFiltLevel() self.mlt = mlt + self.tf = tf def displayLogs(self): if self.displaytail: self.mlt.displayLogs() def setLevel(self, input, verbose): - if input == "1": + if input == "1" or input == "0": if verbose: print "NOTE: Turning off real time log tail" self.logfilter.setFiltLevel(self.handler, self.defaultLevel) self.displaytail = False + if isinstance(self.tf, TerminalFilter): + if input == "0": + self.tf.setNormalMode() + else: + self.tf.setTopMode() elif input == "2": if verbose: print "NOTE: Turning on real time log tail" @@ -284,6 +314,29 @@ class RtLogLevel: print "NOTE: Turning on DEBUG logging + real time log tail" self.logfilter.setFiltLevel(self.handler, logging.DEBUG) self.displaytail = True + elif input == "t": + if verbose: + print "NOTE: Activing task \"top\" mode" + if isinstance(self.tf, TerminalFilter): + self.tf.setTopMode() + elif input == "N": + if verbose: + print "NOTE: Turning on task notes" + if isinstance(self.tf, TerminalFilter): + self.tf.setFilterOff() + elif input == "h" or input == "?": + print "=============================================" + print "Interaction help commands:" + print " 0 - Linear logging" + print " 1 - turn off real time log tail" + print " 2 - turn on real time log tail" + print " 3 - turn on debug logging" + print " 4 - turn on debug logging and real time log tail" + print " t - Display tasks in \"top\" mode" + print " N - Display all runtime NOTE's that are normally filtered (0 or 1 toggles off)" + print " h - display commands" + return False + return True def main(server, eventHandler, params, tf = TerminalFilter): @@ -300,6 +353,10 @@ def main(server, eventHandler, params, tf = TerminalFilter): if error: logger.error("Unable to get the value of BB_CONSOLELOG variable: %s" % error) return 1 + bb_rt_loglevel, error = server.runCommand(["getVariable", "BB_RT_LOGLEVEL"]) + if error: + logger.error("Unable to get the value of BB_RT_LOGLEVEL variable: %s" % error) + return 1 if sys.stdin.isatty() and sys.stdout.isatty(): log_exec_tty = True @@ -319,10 +376,6 @@ def main(server, eventHandler, params, tf = TerminalFilter): format_str = "%(levelname)s: %(message)s" format = bb.msg.BBLogFormatter(format_str) logfilter = bb.msg.addDefaultlogFilter(console) - rtloglevel = RtLogLevel(console, logfilter, mlt) - bb_rt_loglevel = server.runCommand(["getVariable", "BB_RT_LOGLEVEL"]) - if bb_rt_loglevel and bb_rt_loglevel != "": - rtloglevel.setLevel(bb_rt_loglevel, False) console.setFormatter(format) logger.addHandler(console) @@ -367,14 +420,19 @@ def main(server, eventHandler, params, tf = TerminalFilter): termfilter = tf(main, helper, console, format) stdin_mgr = StdinMgr() + rtloglevel = RtLogLevel(console, logfilter, mlt, termfilter) + if bb_rt_loglevel and bb_rt_loglevel != "": + for inputkey in bb_rt_loglevel: + rtloglevel.setLevel(inputkey, False) while True: try: termfilter.updateFooter() event = eventHandler.waitEvent(0.25) if stdin_mgr.poll(): keyinput = sys.stdin.read(1) - rtloglevel.setLevel(keyinput, True) - termfilter.updateFooterForce() + termfilter.clearFooter() + if (rtloglevel.setLevel(keyinput, True)): + termfilter.updateFooterForce() # Always try printing any accumulated log files first rtloglevel.displayLogs() -- 1.8.1.2.545.g2f19ada