8b08d212c3
Now that DIB is python3 only we can remove a hack that made sure
scripts outside the chroot ran with the correct version of python.
This is necessary as python3 does not resolve symbolic links to the
binary like python2.x did, which causes element scripts to fail finding
modules when DIB was run from inside a venv.
This patch does the following:
1. Reverts 9c7b8d1714 which was the
workaround for mixed python2/3 environments.
2. Updates the scripts to use "python3" instead of "python".
Change-Id: If2402bb02fc8a4778fa9434fa167ea1fafd87c28
91 lines
2.9 KiB
Python
91 lines
2.9 KiB
Python
#!/usr/bin/env python3
|
|
#
|
|
# Copyright 2014 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
# This is an output filter to filter and timestamp the logs from Grenade and
|
|
# DevStack. Largely our awk filters got beyond the complexity level which were
|
|
# sustainable, so this provides us much more control in a single place.
|
|
#
|
|
# The overhead of running python should be less than execing `date` a million
|
|
# times during a run.
|
|
|
|
import argparse
|
|
import datetime
|
|
import re
|
|
import sys
|
|
|
|
IGNORE_LINES = re.compile(r'(set \+o|xtrace)')
|
|
|
|
|
|
def get_options():
|
|
parser = argparse.ArgumentParser(
|
|
description='Filter output by DevStack and friends')
|
|
parser.add_argument('-o', '--outfile',
|
|
help='Output file for content',
|
|
default=None)
|
|
parser.add_argument('-v', '--verbose', action='store_true',
|
|
help='Write to stdout',
|
|
default=False)
|
|
parser.add_argument('-b', '--no-timestamp', action='store_true',
|
|
help='Do not prefix stdout with timestamp (bare)',
|
|
default=False)
|
|
return parser.parse_args()
|
|
|
|
|
|
def skip_line(line):
|
|
"""Should we skip this line."""
|
|
return IGNORE_LINES.search(line) is not None
|
|
|
|
|
|
def main():
|
|
opts = get_options()
|
|
outfile = None
|
|
if opts.outfile:
|
|
outfile = open(opts.outfile, 'ab', 0)
|
|
|
|
# Otherwise fileinput reprocess args as files
|
|
sys.argv = []
|
|
for line in iter(sys.stdin.readline, ''):
|
|
# put skip lines here
|
|
if skip_line(line):
|
|
continue
|
|
|
|
now = datetime.datetime.utcnow()
|
|
ts_line = ("%s | %s" % (
|
|
now.strftime("%Y-%m-%d %H:%M:%S.%f")[:-3],
|
|
line))
|
|
|
|
if opts.verbose:
|
|
sys.stdout.write(line if opts.no_timestamp else ts_line)
|
|
sys.stdout.flush()
|
|
if outfile:
|
|
# We've opened outfile as a binary file to get the
|
|
# non-buffered behaviour. on python3, sys.stdin was
|
|
# opened with the system encoding and made the line into
|
|
# utf-8, so write the logfile out in utf-8 bytes.
|
|
if sys.version_info < (3,):
|
|
outfile.write(ts_line)
|
|
else:
|
|
outfile.write(
|
|
ts_line.encode('utf-8', errors='surrogateescape'))
|
|
outfile.flush()
|
|
|
|
|
|
if __name__ == '__main__':
|
|
try:
|
|
sys.exit(main())
|
|
except KeyboardInterrupt:
|
|
sys.exit(1)
|