diff --git a/kloudbuster/kloudbuster.py b/kloudbuster/kloudbuster.py index 20b3728..b33650d 100755 --- a/kloudbuster/kloudbuster.py +++ b/kloudbuster/kloudbuster.py @@ -713,13 +713,16 @@ def create_html(hfp, template, task_re): def generate_charts(json_results, html_file_name): '''Save results in HTML format file.''' - LOG.info('Saving results in HTML file: ' + html_file_name + "...") - if json_results['test_mode'] == "storage": - template_path = resource_filename(__name__, 'template_storage.html') - elif json_results['test_mode'] == "http": - template_path = resource_filename(__name__, 'template_http.html') - else: - LOG.error('Error parsing the json file') + LOG.info('Saving results to HTML file: ' + html_file_name + '...') + try: + if json_results['test_mode'] == "storage": + template_path = resource_filename(__name__, 'template_storage.html') + elif json_results['test_mode'] == "http": + template_path = resource_filename(__name__, 'template_http.html') + else: + raise + except Exception: + LOG.error('Invalid json file.') sys.exit(1) with open(html_file_name, 'w') as hfp, open(template_path, 'r') as template: create_html(hfp, @@ -783,10 +786,11 @@ def main(): CONF.set_default("verbose", True) full_version = __version__ + ', VM image: ' + kb_vm_agent.get_image_name() CONF(sys.argv[1:], project="kloudbuster", version=full_version) + logging.setup("kloudbuster") if CONF.charts_from_json: if not CONF.html: - print 'Error: you must specify the destination html file name using --html' + LOG.error('Destination html filename must be specified using --html.') sys.exit(1) with open(CONF.charts_from_json, 'r') as jfp: json_results = json.load(jfp) @@ -797,7 +801,6 @@ def main(): print resource_string(__name__, "cfg.scale.yaml") sys.exit(0) - logging.setup("kloudbuster") try: kb_config = KBConfig() kb_config.init_with_cli() diff --git a/kloudbuster/start_server.py b/kloudbuster/start_server.py index 248ce46..ef28884 100755 --- a/kloudbuster/start_server.py +++ b/kloudbuster/start_server.py @@ -29,12 +29,15 @@ def exec_command(cmd, cwd=None, show_console=False): def main(): cwd = resource_filename(__name__, 'config.py') cwd = cwd[:cwd.rfind('/')] + '/../kb_server' - cmd = ['stdbuf', '-oL', 'python', 'setup.py', 'develop'] - rc = exec_command(cmd, cwd=cwd) - if not rc: - cmd = ['stdbuf', '-oL', 'pecan', 'serve', 'config.py'] - rc = exec_command(cmd, cwd=cwd, show_console=True) - sys.exit(rc) + try: + cmd = ['stdbuf', '-oL', 'python', 'setup.py', 'develop'] + rc = exec_command(cmd, cwd=cwd) + if not rc: + cmd = ['stdbuf', '-oL', 'pecan', 'serve', 'config.py'] + rc = exec_command(cmd, cwd=cwd, show_console=True) + sys.exit(rc) + except KeyboardInterrupt: + print 'Terminating server...' if __name__ == '__main__': main() diff --git a/kloudbuster/template_http.html b/kloudbuster/template_http.html index 806c5f9..ec94b33 100644 --- a/kloudbuster/template_http.html +++ b/kloudbuster/template_http.html @@ -46,18 +46,25 @@ +
-

[[label]]

+

KloudBuster HTTP Testing Report

@@ -200,4 +207,4 @@ }); - \ No newline at end of file + diff --git a/kloudbuster/template_storage.html b/kloudbuster/template_storage.html index d8011b4..e9db7be 100644 --- a/kloudbuster/template_storage.html +++ b/kloudbuster/template_storage.html @@ -52,7 +52,7 @@
- +

KloudBuster Storage Testing Report