提交 f56e0556 编写于 作者: L Liangliang He

Improve mace tools output

上级 7c1711d8
...@@ -558,7 +558,7 @@ def main(unused_args): ...@@ -558,7 +558,7 @@ def main(unused_args):
print( print(
"====================================================" "===================================================="
) )
print("Trying to lock device", serialno) print("Trying to lock device %s" % serialno)
with sh_commands.device_lock(serialno): with sh_commands.device_lock(serialno):
print("Run on device: %s, %s, %s" % ( print("Run on device: %s, %s, %s" % (
serialno, props["ro.board.platform"], serialno, props["ro.board.platform"],
......
...@@ -46,7 +46,7 @@ def strip_invalid_utf8(str): ...@@ -46,7 +46,7 @@ def strip_invalid_utf8(str):
def make_output_processor(buff): def make_output_processor(buff):
def process_output(line): def process_output(line):
print(line.strip()) print(line.rstrip())
buff.append(line) buff.append(line)
return process_output return process_output
...@@ -189,7 +189,7 @@ def adb_run(serialno, ...@@ -189,7 +189,7 @@ def adb_run(serialno,
print( print(
"=====================================================================" "====================================================================="
) )
print("Trying to lock device", serialno) print("Trying to lock device %s" % serialno)
with device_lock(serialno): with device_lock(serialno):
print("Run on device: %s, %s, %s" % print("Run on device: %s, %s, %s" %
(serialno, props["ro.board.platform"], (serialno, props["ro.board.platform"],
...@@ -1058,7 +1058,7 @@ def falcon_push_metrics(metrics, endpoint="mace_dev", tags={}): ...@@ -1058,7 +1058,7 @@ def falcon_push_metrics(metrics, endpoint="mace_dev", tags={}):
"tags": falcon_tags(tags), "tags": falcon_tags(tags),
"timestamp": ts, "timestamp": ts,
"value": value, "value": value,
"step": 86400, "step": 600,
"counterType": "GAUGE" "counterType": "GAUGE"
} for key, value in metrics.iteritems()] } for key, value in metrics.iteritems()]
cli.update(falcon_metrics) cli.update(falcon_metrics)
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册