Skip to content

disable instrumentation and notification for readonly commands #824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
creamsoup wants to merge 2 commits into
base: development
Choose a base branch
from
+7 −15
Open

disable instrumentation and notification for readonly commands #824

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4621ff
Merge pull request #584 from swar/development
swar May 20, 2021
44ce685
disable instrumentation and notification for readonly commands (view,…
creamsoup May 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions plotmanager/library/utilities/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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
Expand All @@ -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': {}}
Expand Down Expand Up @@ -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)
Expand All @@ -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)