remove `Debug = True when run Flask and add logger

[doctor.git] / tests / inspector.py

diff --git a/tests/inspector.py b/tests/inspector.py
index c8fb00f..129a386 100644 (file)
--- a/tests/inspector.py
+++ b/tests/inspector.py
@@ -8,21 +8,27 @@
 ##############################################################################
 
 import argparse
+import collections
 from flask import Flask
 from flask import request
 import json
+import logger as doctor_log
 import os
+import time
 
 import novaclient.client as novaclient
 
 import nova_force_down
 
+LOG = doctor_log.Logger('doctor_inspector').getLogger()
+
 
 class DoctorInspectorSample(object):
 
     nova_api_version = '2.11'
 
     def __init__(self):
+        self.servers = collections.defaultdict(list)
         self.nova = novaclient.Client(self.nova_api_version,
                                       os.environ['OS_USERNAME'],
                                       os.environ['OS_PASSWORD'],
@@ -31,10 +37,22 @@ class DoctorInspectorSample(object):
                                       connection_pool=True)
         # check nova is available
         self.nova.servers.list(detailed=False)
+        self.init_servers_list()
+
+    def init_servers_list(self):
+        opts = {'all_tenants': True}
+        servers=self.nova.servers.list(search_opts=opts)
+        self.servers.clear()
+        for server in servers:
+            try:
+                host=server.__dict__.get('OS-EXT-SRV-ATTR:host')
+                self.servers[host].append(server)
+                LOG.debug('get hostname=%s from server=%s' % (host, server))
+            except Exception as e:
+                LOG.error('can not get hostname from server=%s' % server)
 
     def disable_compute_host(self, hostname):
-        opts = {'all_tenants': True, 'host': hostname}
-        for server in self.nova.servers.list(detailed=False, search_opts=opts):
+        for server in self.servers[hostname]:
             self.nova.servers.reset_state(server, 'error')
 
         # NOTE: We use our own client here instead of this novaclient for a
@@ -53,9 +71,9 @@ inspector = DoctorInspectorSample()
 
 @app.route('/events', methods=['POST'])
 def event_posted():
-    app.logger.debug('event posted')
-    app.logger.debug('inspector = %s' % inspector)
-    app.logger.debug('received data = %s' % request.data)
+    LOG.info('event posted at %s' % time.time())
+    LOG.info('inspector = %s' % inspector)
+    LOG.info('received data = %s' % request.data)
     d = json.loads(request.data)
     hostname = d['hostname']
     event_type = d['type']
@@ -73,7 +91,7 @@ def get_args():
 
 def main():
     args = get_args()
-    app.run(port=args.port, debug=True)
+    app.run(port=args.port)
 
 
 if __name__ == '__main__':