From 4aff8a1722acc6aad70af015ea0623b2752733ac Mon Sep 17 00:00:00 2001 From: Digimer Date: Sat, 29 Jul 2017 01:29:45 -0400 Subject: [PATCH] * Fixed bad calls to $an->_hostname and $an->_short_hostname. Signed-off-by: Digimer --- AN/Tools/Database.pm | 8 ++++---- AN/Tools/System.pm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/AN/Tools/Database.pm b/AN/Tools/Database.pm index 32b641ff..38f9db57 100755 --- a/AN/Tools/Database.pm +++ b/AN/Tools/Database.pm @@ -1615,7 +1615,7 @@ sub locking }}); # These are used to ID this lock. - my $source_name = $an->hostname; + my $source_name = $an->_hostname; my $source_uuid = $an->data->{sys}{host_uuid}; $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { source_name => $source_name, @@ -1680,7 +1680,7 @@ sub locking }}); # Log that the lock has been released. - $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0039", variables => { host => $an->hostname }}); + $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0039", variables => { host => $an->_hostname }}); } $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { set => $set }}); @@ -1710,7 +1710,7 @@ sub locking }}); # Log that we've renewed the lock. - $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0044", variables => { host => $an->hostname }}); + $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0044", variables => { host => $an->_hostname }}); $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { set => $set }}); return($set); @@ -1799,7 +1799,7 @@ sub locking }}); # Log that we've got the lock. - $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0045", variables => { host => $an->hostname }}); + $an->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0045", variables => { host => $an->_hostname }}); } } diff --git a/AN/Tools/System.pm b/AN/Tools/System.pm index 921c28e9..828c8980 100755 --- a/AN/Tools/System.pm +++ b/AN/Tools/System.pm @@ -376,7 +376,7 @@ sub ping my $output = ""; # If the 'target' is set, we'll call over SSH unless 'target' is 'local' or our hostname. - if (($target) && ($target ne "local") && ($target ne $an->hostname) && ($target ne $an->short_hostname)) + if (($target) && ($target ne "local") && ($target ne $an->_hostname) && ($target ne $an->_short_hostname)) { ### Remote calls $output = $an->System->remote_call({