conditionalGetHostUrlStr -> conditionalGetEndpointHostText

hpcc-systems · Sep 22, 2023 · 42b184a · 42b184a
1 parent 2e89e9f
commit 42b184a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/common/workunit/wujobq.cpp b/common/workunit/wujobq.cpp
@@ -109,7 +109,7 @@ class CJobQueueItem: implements IJobQueueItem, public CInterface
         item->setProp("@wuid",qi->queryWUID());
         item->setProp("@owner",qi->queryOwner());
         StringBuffer eps;
-        conditionalGetHostUrlStr(eps, qi->queryEndpoint());
+        conditionalGetEndpointHostText(eps, qi->queryEndpoint());
         item->setProp("@node",eps.str());
         StringBuffer dts;
         qi->queryEnqueuedTime().getString(dts);

diff --git a/roxie/udplib/udptopo.cpp b/roxie/udplib/udptopo.cpp
@@ -545,7 +545,7 @@ void TopologyManager::_setRoles(const std::vector<RoxieEndpointInfo> &myRoles, b
         default: throwUnexpected();
         }
         topoBuf.append(role.channel).append('|');
-        conditionalGetHostUrlStr(topoBuf, role.ep);
+        conditionalGetEndpointHostText(topoBuf, role.ep);
         topoBuf.append('|').append(role.replicationLevel);
         topoBuf.append('\t').append((__uint64) myInstance);
         topoBuf.append('\n');

diff --git a/system/jlib/jsocket.cpp b/system/jlib/jsocket.cpp
@@ -3889,7 +3889,7 @@ unsigned SocketEndpoint::hash(unsigned prev) const
 }
 
 
-StringBuffer &conditionalGetHostUrlStr(StringBuffer &str, const SocketEndpoint &ep)
+StringBuffer &conditionalGetEndpointHostText(StringBuffer &str, const SocketEndpoint &ep)
 {
     if (isContainerized())
         return ep.getEndpointIpText(str);

diff --git a/system/jlib/jsocket.hpp b/system/jlib/jsocket.hpp
@@ -185,7 +185,7 @@ class jlib_decl SocketEndpoint : extends IpAddress
 
 // Conditionally return endpoint hostname or resolved IP (may want condition to differ in future, e.g. depending on dns configuration)
 // In k8s by default pod hostnames are not resolvable from other pods, use this function when serializing the text of a host to another host
-extern jlib_decl StringBuffer &conditionalGetHostUrlStr(StringBuffer &str, const SocketEndpoint &ep);
+extern jlib_decl StringBuffer &conditionalGetEndpointHostText(StringBuffer &str, const SocketEndpoint &ep);
 
 class jlib_decl SocketEndpointArray : public StructArrayOf<SocketEndpoint>
 { 

diff --git a/thorlcr/master/thmastermain.cpp b/thorlcr/master/thmastermain.cpp
@@ -1019,7 +1019,7 @@ int main( int argc, const char *argv[]  )
             cloudJobName.appendf("%s-%s", workunit, graphName);
 
             StringBuffer myEp;
-            conditionalGetHostUrlStr(myEp, queryMyNode()->endpoint());
+            conditionalGetEndpointHostText(myEp, queryMyNode()->endpoint());
 
             workerNSInstalled = k8s::applyYaml("thorworker", workunit, cloudJobName, "networkpolicy", { }, false, true);
             if (workerNSInstalled)