From 19651804871bd3d6be6fb68e8c50377b32a5fbf7 Mon Sep 17 00:00:00 2001 From: Shay Nehmad Date: Tue, 23 Apr 2019 13:30:39 +0300 Subject: [PATCH] Added init of AwsService to beginning of server lifetime --- monkey/monkey_island/cc/app.py | 4 ++++ monkey/monkey_island/cc/exporter_init.py | 1 + 2 files changed, 5 insertions(+) diff --git a/monkey/monkey_island/cc/app.py b/monkey/monkey_island/cc/app.py index 22b65c8b2..e6f6c2ed3 100644 --- a/monkey/monkey_island/cc/app.py +++ b/monkey/monkey_island/cc/app.py @@ -29,6 +29,7 @@ from monkey_island.cc.resources.telemetry import Telemetry from monkey_island.cc.resources.telemetry_feed import TelemetryFeed from monkey_island.cc.services.config import ConfigService from monkey_island.cc.consts import MONKEY_ISLAND_ABS_PATH +from monkey_island.cc.services.remote_run_aws import RemoteRunAwsService __author__ = 'Barak' @@ -98,6 +99,9 @@ def init_app(mongo_url): database.init() ConfigService.init_config() + # If on AWS, this will set the instance - for usage later in the code. + RemoteRunAwsService.init() + app.add_url_rule('/', 'serve_home', serve_home) app.add_url_rule('/', 'serve_static_file', serve_static_file) diff --git a/monkey/monkey_island/cc/exporter_init.py b/monkey/monkey_island/cc/exporter_init.py index efa88ef4e..fdf26fe8f 100644 --- a/monkey/monkey_island/cc/exporter_init.py +++ b/monkey/monkey_island/cc/exporter_init.py @@ -9,6 +9,7 @@ logger = logging.getLogger(__name__) def populate_exporter_list(): manager = ReportExporterManager() + RemoteRunAwsService.init() if RemoteRunAwsService.is_running_on_aws(): manager.add_exporter_to_list(AWSExporter)