From 30f478267a9657c4f6f0904b4e36c30a9504e8ef Mon Sep 17 00:00:00 2001 From: Digimer Date: Tue, 22 Jun 2021 19:41:00 -0400 Subject: [PATCH] * Forced anvil-daemon to log-level 2 and to enable secure logging to continue debugging setup issues. * Fixed a undefined variable warning. * Removed a debugging die from Database->resync_databases(). Signed-off-by: Digimer --- Anvil/Tools/Database.pm | 4 ++-- Anvil/Tools/Network.pm | 2 +- share/words.xml | 1 + tools/anvil-daemon | 3 +++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Anvil/Tools/Database.pm b/Anvil/Tools/Database.pm index 23f256d4..00f99b19 100644 --- a/Anvil/Tools/Database.pm +++ b/Anvil/Tools/Database.pm @@ -14922,8 +14922,8 @@ sub resync_databases if (not $uuid_column) { # This is a problem - print "Did not find the UUID column for the table: [".$table."]\n"; - die; + $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, priority => "err", key => "error_0311", variables => { table => $table }}); + next; } # Get all the columns in this table. diff --git a/Anvil/Tools/Network.pm b/Anvil/Tools/Network.pm index bc89e5c0..7910bf41 100644 --- a/Anvil/Tools/Network.pm +++ b/Anvil/Tools/Network.pm @@ -2517,7 +2517,7 @@ sub is_local } foreach my $interface (sort {$a cmp $b} keys %{$anvil->data->{network}{$local_host}{interface}}) { - #$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { "network::local::interface::${interface}::ip" => $anvil->data->{network}{$local_host}{interface}{$interface}{ip} }}); + next if not defined $anvil->data->{network}{$local_host}{interface}{$interface}{ip}; if ($host eq $anvil->data->{network}{$local_host}{interface}{$interface}{ip}) { $anvil->data->{cache}{is_local}{$host} = 1; diff --git a/share/words.xml b/share/words.xml index 69c87884..d79f41e0 100644 --- a/share/words.xml +++ b/share/words.xml @@ -422,6 +422,7 @@ The attempt to start the servers appears to have failed. The return code '0' was ,manifest_uuid=,anvil_uuid='. Either the parse failed, or the data was somehow invalid.]]> I tried to change the fencing preferred node to: [#!variable!prefer!#], but it doesn't appear to have worked. The preferred node is: [#!variable!current!#] ('--' means there is no preferred node) I tried to remove the fence delay from the node: [#!variable!node!#], but it doesn't appear to have worked. The preferred node is: [#!variable!current!#] ('--' means there is no preferred node) + Failed to find the UUID column for the table: [#!variable!table!#]. diff --git a/tools/anvil-daemon b/tools/anvil-daemon index 00c36458..20b41460 100755 --- a/tools/anvil-daemon +++ b/tools/anvil-daemon @@ -144,6 +144,9 @@ $anvil->data->{switches}{'no-start'} = 0; $anvil->data->{switches}{'startup-only'} = 0; $anvil->Get->switches; +$anvil->Log->level({set => 1}); +$anvil->Log->secure({set => 1}); + $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0115", variables => { program => $THIS_FILE }}); if ($anvil->data->{switches}{'refresh-json'})