seasharp
/
anvil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up logging while waiting for subnodes.

Browse Source 
Signed-off-by: digimer <mkelly@alteeve.ca>
main
digimer 1 year ago
parent 5d5270486e
commit ef042eef25
2 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      share/words.xml
  2. 3
      tools/anvil-join-anvil

1
share/words.xml
Unescape View File

@ -1688,6 +1688,7 @@ Note: This is a permanent action! If you protect this server again later, a full
<key name="job_0474">The server: [#!variable!server!#] will now be forced off!</key> <key name="job_0474">The server: [#!variable!server!#] will now be forced off!</key>
<key name="job_0475">The subnode: [#!variable!subnode!#] is not ready. Configured: [#!variable!configured!#], maintenance mode: [#!variable!maintenance_mode!#].</key> <key name="job_0475">The subnode: [#!variable!subnode!#] is not ready. Configured: [#!variable!configured!#], maintenance mode: [#!variable!maintenance_mode!#].</key>
<key name="job_0476">Waiting for a bit, then will check again.</key> <key name="job_0476">Waiting for a bit, then will check again.</key>
<key name="job_0477">Waiting for both subnodes to be configured and out of maintenance mode.</key>
<!-- Log entries --> <!-- Log entries -->
<key name="log_0001">Starting: [#!variable!program!#].</key> <key name="log_0001">Starting: [#!variable!program!#].</key>

3
tools/anvil-join-anvil
Unescape View File

@ -2403,6 +2403,7 @@ sub wait_for_subnodes
}}); }});
my $waiting = 1; my $waiting = 1;
update_progress($anvil, $anvil->data->{job}{progress}, "job_0477");
while($waiting) while($waiting)
{ {
my $waiting = 0; my $waiting = 0;
@ -2436,7 +2437,6 @@ sub wait_for_subnodes
$waiting = 1; $waiting = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { waiting => $waiting}}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { waiting => $waiting}});
update_progress($anvil, $anvil->data->{job}{progress}, "job_0475,!!subnode!".$host_name."!!,!!configured!".$configured."!!,!!maintenance_mode!".$maintenance_mode."!!");
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "job_0475", variables => { $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "job_0475", variables => {
subnode => $host_name, subnode => $host_name,
configured => $configured, configured => $configured,
@ -2447,7 +2447,6 @@ sub wait_for_subnodes
if ($waiting) if ($waiting)
{ {
update_progress($anvil, $anvil->data->{job}{progress}, "job_0476");
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "job_0476"}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 2, key => "job_0476"});
sleep 5; sleep 5;
} }

Write Preview
Loading…
Cancel
Save