Moved anvil-configure-host reboot logging to use log_0687 to help grep for reboot causes.

Signed-off-by: Digimer <digimer@alteeve.ca>
main
Digimer 3 years ago
parent 4417931c83
commit 87a2454a09
  1. 1
      share/words.xml
  2. 5
      tools/anvil-configure-host

@ -2085,6 +2085,7 @@ The file: [#!variable!file!#] needs to be updated. The difference is:
<key name="log_0690">Kernel updated, reboot queued.</key> <key name="log_0690">Kernel updated, reboot queued.</key>
<key name="log_0691">Requested to power-off as part of the anvil-safe-stop job.</key> <key name="log_0691">Requested to power-off as part of the anvil-safe-stop job.</key>
<key name="log_0692">The anvil-safe-stop job has completed and will now power off.</key> <key name="log_0692">The anvil-safe-stop job has completed and will now power off.</key>
<key name="log_0693">The anvil-configure-host tool is requesting a reboot.</key>
<!-- Messages for users (less technical than log entries), though sometimes used for logs, too. --> <!-- Messages for users (less technical than log entries), though sometimes used for logs, too. -->
<key name="message_0001">The host name: [#!variable!target!#] does not resolve to an IP address.</key> <key name="message_0001">The host name: [#!variable!target!#] does not resolve to an IP address.</key>

@ -113,6 +113,7 @@ sub do_reboot
my ($anvil) = @_; my ($anvil) = @_;
# Mark that a reboot is needed, in case something kills us before we actually reboot. # Mark that a reboot is needed, in case something kills us before we actually reboot.
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0687", variables => { reason => "log_0693" }});
my ($job_uuid) = $anvil->Database->insert_or_update_jobs({ my ($job_uuid) = $anvil->Database->insert_or_update_jobs({
file => $THIS_FILE, file => $THIS_FILE,
line => __LINE__, line => __LINE__,
@ -1233,7 +1234,7 @@ sub reconfigure_network
# If we should reset, do so now. # If we should reset, do so now.
if ($anvil->data->{sys}{reboot}) if ($anvil->data->{sys}{reboot})
{ {
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, key => "log_0631"}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, 'print' => 1, key => "log_0687", variables => { reason => "log_0631" }});
do_reboot($anvil); do_reboot($anvil);
} }
@ -1241,7 +1242,7 @@ sub reconfigure_network
{ {
# In an attempt to make network changes more reliable, we'll just reboot. This shouldn't # In an attempt to make network changes more reliable, we'll just reboot. This shouldn't
# actually be hit anymore as any change should have triggered the reboot above. # actually be hit anymore as any change should have triggered the reboot above.
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, key => "log_0631"}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, 'print' => 1, key => "log_0687", variables => { reason => "log_0631" }});
do_reboot($anvil); do_reboot($anvil);
# # Re-read the config # # Re-read the config

Loading…
Cancel
Save