diff --git a/plotmanager/library/utilities/commands.py b/plotmanager/library/utilities/commands.py index 1212feb..d19d1a5 100644 --- a/plotmanager/library/utilities/commands.py +++ b/plotmanager/library/utilities/commands.py @@ -79,8 +79,7 @@ def stop_manager(): def json_output(): chia_location, log_directory, config_jobs, manager_check_interval, max_concurrent, max_for_phase_1, \ - minimum_minutes_between_jobs, progress_settings, notification_settings, debug_level, view_settings, \ - instrumentation_settings = get_config_info() + minimum_minutes_between_jobs, progress_settings, _, debug_level, view_settings, _ = get_config_info() system_drives = get_system_drives() @@ -106,11 +105,9 @@ def json_output(): running_work = {} jobs = load_jobs(config_jobs) - jobs, running_work = get_running_plots(jobs=jobs, running_work=running_work, - instrumentation_settings=instrumentation_settings) + jobs, running_work = get_running_plots(jobs=jobs, running_work=running_work, instrumentation_settings={}) check_log_progress(jobs=jobs, running_work=running_work, progress_settings=progress_settings, - notification_settings=notification_settings, view_settings=view_settings, - instrumentation_settings=instrumentation_settings) + notification_settings={}, view_settings=view_settings, instrumentation_settings={}) print_json(jobs=jobs, running_work=running_work, view_settings=view_settings) has_file = False @@ -130,8 +127,7 @@ def json_output(): def view(loop=True): chia_location, log_directory, config_jobs, manager_check_interval, max_concurrent, max_for_phase_1, \ - minimum_minutes_between_jobs, progress_settings, notification_settings, debug_level, view_settings, \ - instrumentation_settings = get_config_info() + minimum_minutes_between_jobs, progress_settings, _, debug_level, view_settings, _ = get_config_info() view_check_interval = view_settings['check_interval'] system_drives = get_system_drives() analysis = {'files': {}} @@ -159,11 +155,9 @@ def view(loop=True): try: analysis = analyze_log_dates(log_directory=log_directory, analysis=analysis) jobs = load_jobs(config_jobs) - jobs, running_work = get_running_plots(jobs=jobs, running_work=running_work, - instrumentation_settings=instrumentation_settings) + jobs, running_work = get_running_plots(jobs=jobs, running_work=running_work, instrumentation_settings={}) check_log_progress(jobs=jobs, running_work=running_work, progress_settings=progress_settings, - notification_settings=notification_settings, view_settings=view_settings, - instrumentation_settings=instrumentation_settings) + notification_settings={}, view_settings=view_settings, instrumentation_settings={}) print_view(jobs=jobs, running_work=running_work, analysis=analysis, drives=drives, next_log_check=datetime.now() + timedelta(seconds=view_check_interval), view_settings=view_settings, loop=loop) @@ -188,7 +182,5 @@ def view(loop=True): def analyze_logs(): - chia_location, log_directory, config_jobs, manager_check_interval, max_concurrent, max_for_phase_1, \ - minimum_minutes_between_jobs, progress_settings, notification_settings, debug_level, view_settings, \ - instrumentation_settings = get_config_info() + _, log_directory, _, _, _, _, _, _, _, _, _, _ = get_config_info() analyze_log_times(log_directory)