Merge pull request #146 from ClusterLabs/scancore-debugging

* Forced anvil-daemon to log-level 2 and to enable secure logging to …

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.

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;

share/words.xml

@@ -422,6 +422,7 @@ The attempt to start the servers appears to have failed. The return code '0' was
 		<key name="error_0308"><![CDATA[[ Error ] - The Job: [#!variable!job-uuid!#] appears to have passed malformed data. The raw data was: [#!variable!raw!#]. Expected 'as_machine=<host_type>,manifest_uuid=<manifest_uuid>,anvil_uuid=<anvil_uuid>'. Either the parse failed, or the data was somehow invalid.]]></key>
 		<key name="error_0309">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)</key>
 		<key name="error_0310">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)</key>
+		<key name="error_0311">Failed to find the UUID column for the table: [#!variable!table!#].</key>
 		
 		<!-- Files templates -->
 		<!-- NOTE: Translating these files requires an understanding of which lines are translatable -->

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'})