From 4b82c5f2bfb137fe71ca2e1fd5eba4285417cf57 Mon Sep 17 00:00:00 2001
From: Madison Kelly <mkelly@alteeve.com>
Date: Thu, 6 Jun 2024 15:33:56 -0400
Subject: [PATCH] Added 'timeout' logging to help debug SIGALARM exits.

Signed-off-by: digimer <mkelly@alteeve.ca>
Signed-off-by: Madison Kelly <mkelly@alteeve.com>
---
 Anvil/Tools/Network.pm | 18 ++++++++++++++++++
 Anvil/Tools/System.pm  |  4 ++++
 share/words.xml        |  4 +++-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/Anvil/Tools/Network.pm b/Anvil/Tools/Network.pm
index 58bf1ed7..71c17c55 100644
--- a/Anvil/Tools/Network.pm
+++ b/Anvil/Tools/Network.pm
@@ -4283,6 +4283,24 @@ sub ping
 			target   => $target, 
 			is_local => $is_local,
 		}});
+		if ($timeout)
+		{
+			if ($is_local)
+			{
+				$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, secure => $secure, key => "log_0855", variables => { 
+					shell_call => $shell_call, 
+					timeout    => $timeout, 
+				}});
+			}
+			else
+			{
+				$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, secure => $secure, key => "log_0853", variables => { 
+					shell_call => $shell_call, 
+					timeout    => $timeout, 
+					target     => $target, 
+				}});
+			}
+		}
 		if ($is_local)
 		{
 			### Local calls
diff --git a/Anvil/Tools/System.pm b/Anvil/Tools/System.pm
index 6f42ccfd..793f7168 100644
--- a/Anvil/Tools/System.pm
+++ b/Anvil/Tools/System.pm
@@ -309,6 +309,10 @@ sub call
 			if ($timeout)
 			{
 				# Prepend a timeout.
+				$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, secure => $secure, key => "log_0855", variables => { 
+					shell_call => $shell_call, 
+					timeout    => $timeout, 
+				}});
 				$shell_call = $anvil->data->{path}{exe}{timeout}." ".$timeout." ".$shell_call;
 				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, secure => $secure, list => { shell_call => $shell_call }});
 			}
diff --git a/share/words.xml b/share/words.xml
index 6ba71d81..0cfff45c 100644
--- a/share/words.xml
+++ b/share/words.xml
@@ -2742,6 +2742,8 @@ new key: [#!variable!new_key!#]</key>
 		<key name="log_0852">Finished configuring bonds.</key>
 		<key name="log_0853">Now configuring bridges.</key>
 		<key name="log_0854">The connection to the database: [#!variable!server!#] has been restored!</key>
+		<key name="log_0855">Calling: [#!variable!shell_call!#] via a 'timeout' of: [#!variable!timeout!#] seconds.</key>
+		<key name="log_0856">Calling: [#!variable!shell_call!#] on: [#!variable!target!#] via a 'timeout' of: [#!variable!timeout!#] seconds.</key>
 
 		<!-- 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>
@@ -3109,7 +3111,7 @@ Are you sure that you want to delete the server: [#!variable!server_name!#]? [Ty
 		<key name="message_0263">Preparing to get server VM screenshot.</key>
 		<key name="message_0264">Finished getting server VM screenshot.</key>
 		<key name="message_0265">Failed to get server VM screenshot; got non-zero return code.</key>
-		<key name="message_0266">Finished attempting to get server VM screenshot; no operations happened because requirements not met.</key>>>> master
+		<key name="message_0266">Finished attempting to get server VM screenshot; no operations happened because requirements not met.</key>
 		<key name="message_0267">Preparing to manage DR for a server.</key>
 		<key name="message_0268">UUID Column counts for: [history.#!variable!table!#]:</key>
 		<key name="message_0269">Counting entries for each unique: [#!variable!column!#] in the table [#!variable!table!#]. Please be patient.</key>