X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0514b290f5ff9a2700b599bf6fb19a468a73c3fb..d5ddfd9d876a75327795793544d105051f2a306e:/services/nodemanager/arvnodeman/launcher.py diff --git a/services/nodemanager/arvnodeman/launcher.py b/services/nodemanager/arvnodeman/launcher.py index 87ce48769e..9c45318fdc 100644 --- a/services/nodemanager/arvnodeman/launcher.py +++ b/services/nodemanager/arvnodeman/launcher.py @@ -10,6 +10,7 @@ import time import daemon import pykka +import libcloud from . import config as nmconfig from .baseactor import WatchdogActor @@ -62,6 +63,7 @@ def setup_logging(path, level, **sublevels): for logger_name, sublevel in sublevels.iteritems(): sublogger = logging.getLogger(logger_name) sublogger.setLevel(sublevel) + return root_logger def build_server_calculator(config): cloud_size_list = config.node_sizes(config.new_cloud_client().list_sizes()) @@ -77,7 +79,7 @@ def launch_pollers(config, server_calculator): timer = TimedCallBackActor.start(poll_time / 10.0).tell_proxy() cloud_node_poller = CloudNodeListMonitorActor.start( - config.new_cloud_client(), timer, poll_time, max_poll_time).tell_proxy() + config.new_cloud_client(), timer, server_calculator, poll_time, max_poll_time).tell_proxy() arvados_node_poller = ArvadosNodeListMonitorActor.start( config.new_arvados_client(), timer, poll_time, max_poll_time).tell_proxy() job_queue_poller = JobQueueMonitorActor.start( @@ -110,7 +112,8 @@ def main(args=None): signal.signal(sigcode, shutdown_signal) try: - setup_logging(config.get('Logging', 'file'), **config.log_levels()) + root_logger = setup_logging(config.get('Logging', 'file'), **config.log_levels()) + root_logger.info("%s %s, libcloud %s", sys.argv[0], __version__, libcloud.__version__) node_setup, node_shutdown, node_update, node_monitor = \ config.dispatch_classes() server_calculator = build_server_calculator(config)