summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitreview2
-rw-r--r--.zuul.yaml5
-rw-r--r--oslo_log/formatters.py2
-rw-r--r--playbooks/legacy/oslo.log-src-grenade-devstack/run.yaml8
-rw-r--r--setup.cfg2
-rw-r--r--tox.ini2
6 files changed, 11 insertions, 10 deletions
diff --git a/.gitreview b/.gitreview
index 25d1324..680b74c 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
[gerrit]
-host=review.openstack.org
+host=review.opendev.org
port=29418
project=openstack/oslo.log.git \ No newline at end of file
diff --git a/.zuul.yaml b/.zuul.yaml
index d87e757..4aa6533 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -7,8 +7,8 @@
- ^setup.cfg$
post-run: playbooks/legacy/oslo.log-src-grenade-devstack/post.yaml
required-projects:
- - openstack-dev/grenade
- - openstack-infra/devstack-gate
+ - openstack/grenade
+ - openstack/devstack-gate
- openstack/oslo.log
run: playbooks/legacy/oslo.log-src-grenade-devstack/run.yaml
timeout: 10800
@@ -56,7 +56,6 @@
- lib-forward-testing-python3
- openstack-lower-constraints-jobs
- openstack-python-jobs
- - openstack-python35-jobs
- openstack-python36-jobs
- periodic-stable-jobs
- publish-openstack-docs-pti
diff --git a/oslo_log/formatters.py b/oslo_log/formatters.py
index 8386ccc..0ed54f8 100644
--- a/oslo_log/formatters.py
+++ b/oslo_log/formatters.py
@@ -301,6 +301,7 @@ class FluentFormatter(logging.Formatter):
self.hostname = socket.gethostname()
except socket.error:
self.hostname = None
+ self.cmdline = " ".join(sys.argv)
def formatException(self, exc_info, strip_newlines=True):
try:
@@ -324,6 +325,7 @@ class FluentFormatter(logging.Formatter):
'module': record.module,
'funcname': record.funcName,
'process_name': record.processName,
+ 'cmdline': self.cmdline,
'hostname': self.hostname,
'traceback': None,
'error_summary': _get_error_summary(record)}
diff --git a/playbooks/legacy/oslo.log-src-grenade-devstack/run.yaml b/playbooks/legacy/oslo.log-src-grenade-devstack/run.yaml
index 9e6a476..563f1a0 100644
--- a/playbooks/legacy/oslo.log-src-grenade-devstack/run.yaml
+++ b/playbooks/legacy/oslo.log-src-grenade-devstack/run.yaml
@@ -13,12 +13,12 @@
set -x
cat > clonemap.yaml << EOF
clonemap:
- - name: openstack-infra/devstack-gate
+ - name: openstack/devstack-gate
dest: devstack-gate
EOF
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
- https://git.openstack.org \
- openstack-infra/devstack-gate
+ https://opendev.org \
+ openstack/devstack-gate
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
@@ -27,7 +27,7 @@
cmd: |
set -e
set -x
- export PROJECTS="openstack-dev/grenade $PROJECTS"
+ export PROJECTS="openstack/grenade $PROJECTS"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_GRENADE=pullup
diff --git a/setup.cfg b/setup.cfg
index f3f1684..e38c351 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ classifier =
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
- Programming Language :: Python :: 3.5
+ Programming Language :: Python :: 3.6
[files]
packages =
diff --git a/tox.ini b/tox.ini
index 58e3b68..da1a025 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
minversion = 2.0
-envlist = py35,py27,pep8
+envlist = py36,py27,pep8
[testenv]
whitelist_externals =