Author: challngr
Date: Tue Feb 16 15:48:22 2016
New Revision: 1730702
URL: http://svn.apache.org/viewvc?rev=1730702&view=rev
Log:
UIMA-4577 Eliminate color prefix-chars doing cqlsh in rm_qoccupancy.
Modified:
uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qoccupancy
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qoccupancy
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qoccupancy?rev=1730702&r1=1730701&r2=1730702&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qoccupancy (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/rm_qoccupancy Tue Feb 16
15:48:22 2016
@@ -80,10 +80,6 @@ class DuccRmQOccupancy(DuccUtil):
shares = {}
header = []
for l in lines:
- # First character of first line may be 0x1B ESC
- if len(l) > 0 and not l[0] in string.printable:
- print 'Ignoring line', '[' + l + '] hex:', binascii.hexlify(l)
- continue
if ( l == '' ):
continue
if ( '---' in l ):
@@ -124,6 +120,7 @@ class DuccRmQOccupancy(DuccUtil):
DH = self.DUCC_HOME
dbn = self.ducc_properties.get('ducc.database.host')
+ os.environ['TERM'] = 'dumb' # insure no colors. --no-color isn't
inhibiting colors in this shell for some reason.
CMD = [DH + '/cassandra-server/bin/cqlsh', dbn, '-u', 'guest', '-p',
'guest', '-e', '"select * from ducc.rmnodes; select * from ducc.rmshares;"']
CMD = ' '.join(CMD)
@@ -131,7 +128,7 @@ class DuccRmQOccupancy(DuccUtil):
proc = subprocess.Popen(CMD, bufsize=0, stdout=subprocess.PIPE,
shell=True)
for line in proc.stdout:
# print line.strip()
- lines.append(line)
+ lines.append(line.strip())
nodes, shares = self.rmnodes(lines)
self.format(nodes, shares)
