* Fixed a bug where getting the job_uuid after a no-db run wouldn't actually update the job progress.

Signed-off-by: digimer <mkelly@alteeve.ca>
main
digimer 1 year ago
parent 6a7c9923ad
commit 88e8978305
  1. 18
      tools/anvil-update-system

@ -151,8 +151,10 @@ AND
if ($job_uuid) if ($job_uuid)
{ {
$anvil->data->{jobs}{job_uuid} = $job_uuid;
$anvil->data->{switches}{'job-uuid'} = $job_uuid; $anvil->data->{switches}{'job-uuid'} = $job_uuid;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
'jobs::job_uuid' => $anvil->data->{jobs}{job_uuid},
'switches::job-uuid' => $anvil->data->{switches}{'job-uuid'}, 'switches::job-uuid' => $anvil->data->{switches}{'job-uuid'},
}}); }});
@ -243,7 +245,7 @@ sub update_progress
my ($anvil, $progress, $message) = @_; my ($anvil, $progress, $message) = @_;
# Log the progress percentage. # Log the progress percentage.
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
progress => $progress, progress => $progress,
message => $message, message => $message,
"jobs::job_uuid" => $anvil->data->{jobs}{job_uuid}, "jobs::job_uuid" => $anvil->data->{jobs}{job_uuid},
@ -252,13 +254,13 @@ sub update_progress
if ($progress > 100) if ($progress > 100)
{ {
$progress = 100; $progress = 100;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { progress => $progress }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { progress => $progress }});
} }
if ($anvil->data->{jobs}{job_uuid}) if ($anvil->data->{jobs}{job_uuid})
{ {
$anvil->Job->update_progress({ $anvil->Job->update_progress({
debug => 3, debug => 2,
'print' => 1, 'print' => 1,
progress => $progress, progress => $progress,
message => $message, message => $message,
@ -599,5 +601,15 @@ WHERE
$anvil->nice_exit({exit_code => 3}); $anvil->nice_exit({exit_code => 3});
} }
# Run anvil-version-changes.
$shell_call = $anvil->data->{path}{exe}{'anvil-version-changes'}.$anvil->Log->switches;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { shell_call => $shell_call }});
($output, $return_code) = $anvil->System->call({shell_call => $shell_call});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
output => $output,
return_code => $return_code,
}});
return(0); return(0);
}; };

Loading…
Cancel
Save