openstack
/
kolla-cli
Code Issues Proposed changes

Better handling of unicode in log collector. 

Jira-Issue: OPENSTACK-697
This commit is contained in:
Steve Noyes 2016-03-15 17:19:19 -04:00
parent 2ed4290add
commit a15db48689
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/log_collector.py
View File

@ -18,6 +18,7 @@ import subprocess
import sys import sys
import tarfile import tarfile
import tempfile import tempfile
import traceback
from kollacli.common.inventory import Inventory from kollacli.common.inventory import Inventory
from kollacli.common import properties from kollacli.common import properties
@ -62,12 +63,19 @@ def run_ansible_cmd(cmd, host):
def add_logdata_to_tar(logdata, host, cname, cid): def add_logdata_to_tar(logdata, host, cname, cid):
print('Adding container log %s:%s(%s)' % (host, cname, cid)) print('Adding container log %s:%s(%s)' % (host, cname, cid))
fd, tmp_path = tempfile.mkstemp() archive_name = '/%s/%s_%s.log' % (host, cname, cid)
os.close(fd) # avoid fd leak tmp_path = None
with open(tmp_path, 'w') as tmpfile: try:
tmpfile.write(logdata) fd, tmp_path = tempfile.mkstemp()
tar_file_descr.add(tmp_path, arcname='/%s/%s_%s.log' % (host, cname, cid)) os.close(fd) # avoid fd leak
os.remove(tmp_path) with open(tmp_path, 'w') as tmpfile:
tmpfile.write(logdata)
tar_file_descr.add(tmp_path, arcname=archive_name)
except Exception:
print('ERROR adding %s\n%s' % (archive_name, traceback.format_exc()))
finally:
if tmp_path and os.path.exists(tmp_path):
os.remove(tmp_path)
def get_containers(host): def get_containers(host):
@ -76,6 +84,7 @@ def get_containers(host):
out = run_ansible_cmd(cmd, host) out = run_ansible_cmd(cmd, host)
if not out: if not out:
return None return None
out = safe_decode(out)
if 'NAMES' not in out: if 'NAMES' not in out:
print('Host: %s. \nInvalid docker ps return data: [%s]. skipping' print('Host: %s. \nInvalid docker ps return data: [%s]. skipping'
% (host, out)) % (host, out))
@ -117,6 +126,7 @@ def add_container_log(cid, cname, host):
cmd = 'docker logs %s' % cid cmd = 'docker logs %s' % cid
out = run_ansible_cmd(cmd, host) out = run_ansible_cmd(cmd, host)
if out: if out:
out = safe_decode(out)
out = out.split('>>', 1)[1] out = out.split('>>', 1)[1]
header = ('Host: %s, Container: %s, id: %s\n' header = ('Host: %s, Container: %s, id: %s\n'
% (host, cname, cid)) % (host, cname, cid))