summaryrefslogtreecommitdiff
path: root/nova/cmd/api_ec2.py
diff options
context:
space:
mode:
authorSolly Ross <sross@redhat.com>2014-01-24 17:58:07 -0500
committerSolly Ross <sross@redhat.com>2014-02-24 19:24:41 -0500
commitcec532848f569afb4832029bce4969578472a57a (patch)
tree3f85cddce9fed47722abe517f029ba2edfbf1466 /nova/cmd/api_ec2.py
parent2adde1b7f4ec898911815c701fd6cc34d371f905 (diff)
downloadnova-cec532848f569afb4832029bce4969578472a57a.tar.gz
Introduce Guru Meditation Reports into Nova
This commit integrates functionality from the `openstack.common.report` module into Nova. This enables Nova services to receive SIGUSR1 and print a Guru Meditation Report to stderr. The required modules were added to 'openstack-common.conf' as well. Change-Id: I224a426dad084f0e738069207ffbffe7f7935a17 Implements: blueprint guru-meditation-report
Diffstat (limited to 'nova/cmd/api_ec2.py')
-rw-r--r--nova/cmd/api_ec2.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/nova/cmd/api_ec2.py b/nova/cmd/api_ec2.py
index 6e83ee0697..65aaf02da6 100644
--- a/nova/cmd/api_ec2.py
+++ b/nova/cmd/api_ec2.py
@@ -22,8 +22,10 @@ from oslo.config import cfg
from nova import config
from nova.openstack.common import log as logging
+from nova.openstack.common.report import guru_meditation_report as gmr
from nova import service
from nova import utils
+from nova import version
CONF = cfg.CONF
@@ -34,6 +36,9 @@ def main():
config.parse_args(sys.argv)
logging.setup("nova")
utils.monkey_patch()
+
+ gmr.TextGuruMeditation.setup_autorun(version)
+
should_use_ssl = 'ec2' in CONF.enabled_ssl_apis
server = service.WSGIService('ec2', use_ssl=should_use_ssl,
max_url_len=16384)