seasharp/anvil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated anvil-daemon to run anvil-configure-host jobs when mapping net

Browse Source 
Also fixed a bug in anvil-manage-host that prevented showing if the
network mapping flag was set.

Signed-off-by: digimer <mkelly@alteeve.ca>
This commit is contained in:
digimer 2023-11-03 15:25:45 -04:00
parent ff3d1983e3
commit 3251154366
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tools/anvil-daemon
View File

@ -1586,7 +1586,7 @@ sub keep_running
} }
# Run any pending jobs by calling 'anvil-jobs' with the 'job_uuid' as a background process. # Run any pending jobs by calling 'anvil-jobs' with the 'job_uuid' as a background process.
run_jobs($anvil, 0) if not $anvil->data->{sys}{mapping_network}; run_jobs($anvil, 0);
return(0); return(0);
} }
@ -1622,13 +1622,14 @@ sub run_jobs
# If we're not configured, we won't hold on starting jobs # If we're not configured, we won't hold on starting jobs
my $configured = $anvil->System->check_if_configured; my $configured = $anvil->System->check_if_configured;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { configured => $configured }});
# We'll also update the jobs.json file. # We'll also update the jobs.json file.
my $jobs_file = "{\"jobs\":[\n"; my $jobs_file = "{\"jobs\":[\n";
# Get a list of pending or incomplete jobs. # Get a list of pending or incomplete jobs.
my $ended_within = $startup ? 1 : 300; my $ended_within = $startup ? 1 : 300;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { ended_within => $ended_within }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { ended_within => $ended_within }});
$anvil->Database->get_jobs({ $anvil->Database->get_jobs({
debug => 2, debug => 2,
@ -1661,22 +1662,26 @@ sub run_jobs
my $started_seconds_ago = $job_picked_up_at ? (time - $job_picked_up_at) : 0; my $started_seconds_ago = $job_picked_up_at ? (time - $job_picked_up_at) : 0;
my $updated_seconds_ago = $job_updated ? (time - $job_updated) : 0; my $updated_seconds_ago = $job_updated ? (time - $job_updated) : 0;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
's01:job_uuid' => $job_uuid, 's01:job_uuid' => $job_uuid,
's02:job_command' => $job_command, 's02:job_command' => $job_command,
's03:short_command' => $short_command, 's03:short_command' => $short_command,
's04:job_data' => $job_data, 's04:job_data' => $job_data,
's05:job_picked_up_by' => $job_picked_up_by, 's05:job_picked_up_by' => $job_picked_up_by,
's06:job_picked_up_at' => $job_picked_up_at, 's06:job_picked_up_at' => $job_picked_up_at,
's07:job_updated' => $job_updated, 's07:job_updated' => $job_updated,
's08:job_name' => $job_name, 's08:job_name' => $job_name,
's09:job_progress' => $job_progress, 's09:job_progress' => $job_progress,
's10:job_title' => $job_title, 's10:job_title' => $job_title,
's11:job_description' => $job_description, 's11:job_description' => $job_description,
's12:job_status' => $job_status, 's12:job_status' => $job_status,
's13:started_seconds_ago' => $started_seconds_ago, 's13:started_seconds_ago' => $started_seconds_ago,
's14:updated_seconds_ago' => $updated_seconds_ago, 's14:updated_seconds_ago' => $updated_seconds_ago,
's15:sys::mapping_network' => $anvil->data->{sys}{mapping_network},
}}); }});
# If we're mapping, we'll only run 'anvil-configure-host' jobs on this host.
next if (($anvil->data->{sys}{mapping_network}) && ($job_command !~ /anvil-configure-host/));
# To minimize the chance of race conditions, any given command will be called only # To minimize the chance of race conditions, any given command will be called only
# once at a time. If two jobs of the same command exist, only one will be called. # once at a time. If two jobs of the same command exist, only one will be called.
if ($job_progress != 100) if ($job_progress != 100)

2
tools/anvil-manage-host
View File

@ -247,7 +247,7 @@ sub update_network_mapping
's4:map_network_modified_date' => $map_network_modified_date, 's4:map_network_modified_date' => $map_network_modified_date,
's5:map_network_uuid' => $map_network_uuid, 's5:map_network_uuid' => $map_network_uuid,
}}); }});
if ($anvil->data->{switches}{'check-configured'}) if ($anvil->data->{switches}{'check-network-mapping'})
{ {
# We'll run for a day (should be cancelled by the program when the user's done, so this # We'll run for a day (should be cancelled by the program when the user's done, so this
# shouldn't fire in practice). # shouldn't fire in practice).