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

Merge branch 'master' into bond-monitor

Browse Source
main
Digimer 4 years ago committed by GitHub
parent bbad058b33 c5f8cc9f7c
commit 1c02dbdaa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 27 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. 54
      Anvil/Tools/DRBD.pm

54
Anvil/Tools/DRBD.pm
Unescape View File

@ -2769,25 +2769,25 @@ sub update_global_common
} }
} }
if ($line =~ /(\s*)timeout(\s+)(.*?)(;.*)$/) if ($line =~ /(\s*)ping-timeout(\s+)(.*?)(;.*)$/)
{ {
my $left_space = $1; my $left_space = $1;
my $middle_space = $2; my $middle_space = $2;
my $value = $3; my $value = $3;
my $right_side = $4; my $right_side = $4;
$timeout_seen = 1; $ping_timeout_seen = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
's1:left_space' => $left_space, 's1:left_space' => $left_space,
's2:middle_space' => $middle_space, 's2:middle_space' => $middle_space,
's3:value' => $value, 's3:value' => $value,
's4:right_side' => $right_side, 's4:right_side' => $right_side,
's5:timeout_seen' => $timeout_seen, 's5:ping_timeout_seen' => $ping_timeout_seen,
}}); }});
if ($value ne $say_timeout) if ($value ne $say_ping_timeout)
{ {
$update = 1; $update = 1;
my $new_line = $left_space."timeout".$middle_space.$say_timeout.$right_side; my $new_line = $left_space."ping-timeout".$middle_space.$say_ping_timeout.$right_side;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
's1:update' => $update, 's1:update' => $update,
's2:new_line' => $new_line, 's2:new_line' => $new_line,
@ -2798,26 +2798,26 @@ sub update_global_common
next; next;
} }
} }
# For some reason, this matches 'ping-timeout' hence the 'else'.
if ($line =~ /(\s*)ping-timeout(\s+)(.*?)(;.*)$/) elsif ($line =~ /(\s*)timeout(\s+)(.*?)(;.*)$/)
{ {
my $left_space = $1; my $left_space = $1;
my $middle_space = $2; my $middle_space = $2;
my $value = $3; my $value = $3;
my $right_side = $4; my $right_side = $4;
$ping_timeout_seen = 1; $timeout_seen = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
's1:left_space' => $left_space, 's1:left_space' => $left_space,
's2:middle_space' => $middle_space, 's2:middle_space' => $middle_space,
's3:value' => $value, 's3:value' => $value,
's4:right_side' => $right_side, 's4:right_side' => $right_side,
's5:ping_timeout_seen' => $ping_timeout_seen, 's5:timeout_seen' => $timeout_seen,
}}); }});
if ($value ne $say_ping_timeout) if ($value ne $say_timeout)
{ {
$update = 1; $update = 1;
my $new_line = $left_space."ping-timeout".$middle_space.$say_ping_timeout.$right_side; my $new_line = $left_space."timeout".$middle_space.$say_timeout.$right_side;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
's1:update' => $update, 's1:update' => $update,
's2:new_line' => $new_line, 's2:new_line' => $new_line,

Write Preview
Loading…
Cancel
Save