* Added more logging while chasing a function test bug.

Signed-off-by: Digimer <digimer@alteeve.ca>
main
Digimer 4 years ago
parent 0f43961568
commit 19c41c9171
  1. 18
      tools/anvil-daemon
  2. 3
      tools/anvil-manage-power
  3. 4
      tools/anvil-update-system

@ -857,10 +857,10 @@ AND
AND AND
variable_name = 'reboot::needed' variable_name = 'reboot::needed'
;"; ;";
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0124", variables => { query => $query }}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0124", variables => { query => $query }});
my $results = $anvil->Database->query({query => $query, source => $THIS_FILE, line => __LINE__}); my $results = $anvil->Database->query({query => $query, source => $THIS_FILE, line => __LINE__});
my $count = @{$results}; my $count = @{$results};
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
results => $results, results => $results,
count => $count, count => $count,
}}); }});
@ -869,7 +869,7 @@ AND
$reboot_needed = $results->[0]->[0]; $reboot_needed = $results->[0]->[0];
$changed_seconds_ago = $results->[0]->[1]; $changed_seconds_ago = $results->[0]->[1];
$changed_seconds_ago =~ s/^(\d+)\..*$/$1/; $changed_seconds_ago =~ s/^(\d+)\..*$/$1/;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
reboot_needed => $reboot_needed, reboot_needed => $reboot_needed,
changed_seconds_ago => $changed_seconds_ago, changed_seconds_ago => $changed_seconds_ago,
}}); }});
@ -879,7 +879,7 @@ AND
# set. If the uptime is less, then the system rebooted since it was requested so clear it. h/t to # set. If the uptime is less, then the system rebooted since it was requested so clear it. h/t to
# Lisa Seelye (@thedoh) for this idea! # Lisa Seelye (@thedoh) for this idea!
my $difference = ($changed_seconds_ago - $uptime); my $difference = ($changed_seconds_ago - $uptime);
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"s1:reboot_needed" => $reboot_needed, "s1:reboot_needed" => $reboot_needed,
"s2:changed_seconds_ago" => $changed_seconds_ago, "s2:changed_seconds_ago" => $changed_seconds_ago,
"s3:uptime" => $uptime, "s3:uptime" => $uptime,
@ -890,18 +890,18 @@ AND
if ($uptime < $changed_seconds_ago) if ($uptime < $changed_seconds_ago)
{ {
# Clear the reboot request. # Clear the reboot request.
$reboot_needed = $anvil->System->reboot_needed({set => 0}); $reboot_needed = $anvil->System->reboot_needed({debug => 2, set => 0});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { reboot_needed => $reboot_needed }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { reboot_needed => $reboot_needed }});
# Check to see if there was a reboot job in progress. If so, finish it off. # Check to see if there was a reboot job in progress. If so, finish it off.
my $job_uuid = $anvil->Job->get_job_uuid({program => "anvil-manage-power"}); my $job_uuid = $anvil->Job->get_job_uuid({debug => 2, program => "anvil-manage-power"});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { job_uuid => $job_uuid }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { job_uuid => $job_uuid }});
if ($job_uuid) if ($job_uuid)
{ {
# Update the percentage to '100' and then clear the old PID. # Update the percentage to '100' and then clear the old PID.
my $date_time = $anvil->Get->date_and_time(); my $date_time = $anvil->Get->date_and_time();
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { date_time => $date_time }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { date_time => $date_time }});
$anvil->Job->update_progress({ $anvil->Job->update_progress({
progress => 100, progress => 100,

@ -245,10 +245,11 @@ sub do_poweroff
# Make sure the 'reboot needed' flag is set. When 'anvil-daemon' starts, it will use this to confirm # Make sure the 'reboot needed' flag is set. When 'anvil-daemon' starts, it will use this to confirm
# that it is starting post-reboot and clear it. # that it is starting post-reboot and clear it.
$reboot_needed = $anvil->System->reboot_needed({debug => 2, set => 1}); $reboot_needed = $anvil->System->reboot_needed({debug => 2, set => 1});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { reboot_needed => $reboot_needed }});
# Mark our power state. # Mark our power state.
$anvil->Database->update_host_status({ $anvil->Database->update_host_status({
debug => $debug, debug => 2,
host_uuid => $anvil->Get->host_uuid, host_uuid => $anvil->Get->host_uuid,
host_status => $task eq "poweroff" ? "rebooting" : "stopping";, host_status => $task eq "poweroff" ? "rebooting" : "stopping";,
}); });

@ -94,8 +94,8 @@ $anvil->System->maintenance_mode({set => 1});
run_os_update($anvil); run_os_update($anvil);
# We're done updating # We're done updating
my $reboot_needed = $anvil->System->reboot_needed(); my $reboot_needed = $anvil->System->reboot_needed({debug => 2});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { reboot_needed => $reboot_needed }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { reboot_needed => $reboot_needed }});
if ($reboot_needed) if ($reboot_needed)
{ {
update_progress($anvil, 100, "message_0039"); update_progress($anvil, 100, "message_0039");

Loading…
Cancel
Save