|
 |
cad3e37 |
From d31a125e408996da726f06632260ae06949ac056 Mon Sep 17 00:00:00 2001
|
|
|
cad3e37 |
From: Ben Cotton <ben.cotton@cyclecomputing.com>
|
|
|
cad3e37 |
Date: Wed, 24 Jun 2015 16:39:41 -0400
|
|
|
cad3e37 |
Subject: [PATCH 2/2] Change ReliSock::assign to ReliSock::assignSocket (see
|
|
|
cad3e37 |
tickets #4713, #4288)
|
|
|
cad3e37 |
|
|
|
cad3e37 |
|
|
|
cad3e37 |
diff --git a/src/condor_contrib/aviary/src/collector/AviaryCollectorPlugin.cpp b/src/condor_contrib/aviary/src/collector/AviaryCollectorPlugin.cpp
|
|
|
cad3e37 |
index 7cdfc3b..48268e3 100644
|
|
|
cad3e37 |
--- a/src/condor_contrib/aviary/src/collector/AviaryCollectorPlugin.cpp
|
|
|
cad3e37 |
+++ b/src/condor_contrib/aviary/src/collector/AviaryCollectorPlugin.cpp
|
|
|
cad3e37 |
@@ -68,7 +68,7 @@ struct AviaryCollectorPlugin : public Service, CollectorPlugin
|
|
|
cad3e37 |
EXCEPT("Failed to allocate transport socket");
|
|
|
cad3e37 |
}
|
|
|
cad3e37 |
|
|
|
cad3e37 |
- if (!sock->assign(provider->getListenerSocket())) {
|
|
|
cad3e37 |
+ if (!sock->assignSocket(provider->getListenerSocket())) {
|
|
|
cad3e37 |
EXCEPT("Failed to bind transport socket");
|
|
|
cad3e37 |
}
|
|
|
cad3e37 |
int index;
|
|
|
cad3e37 |
diff --git a/src/condor_contrib/aviary/src/hadoop/AviaryHadoopPlugin.cpp b/src/condor_contrib/aviary/src/hadoop/AviaryHadoopPlugin.cpp
|
|
|
cad3e37 |
index 13c7207..f3891e5 100644
|
|
|
cad3e37 |
--- a/src/condor_contrib/aviary/src/hadoop/AviaryHadoopPlugin.cpp
|
|
|
cad3e37 |
+++ b/src/condor_contrib/aviary/src/hadoop/AviaryHadoopPlugin.cpp
|
|
|
cad3e37 |
@@ -75,7 +75,7 @@ AviaryHadoopPlugin::earlyInitialize()
|
|
|
cad3e37 |
if (!sock) {
|
|
|
cad3e37 |
EXCEPT("Failed to allocate transport socket");
|
|
|
cad3e37 |
}
|
|
|
cad3e37 |
- if (!sock->assign(provider->getListenerSocket())) {
|
|
|
cad3e37 |
+ if (!sock->assignSocket(provider->getListenerSocket())) {
|
|
|
cad3e37 |
EXCEPT("Failed to bind transport socket");
|
|
|
cad3e37 |
}
|
|
|
cad3e37 |
int index;
|
|
|
cad3e37 |
diff --git a/src/condor_contrib/aviary/src/job/AviaryScheddPlugin.cpp b/src/condor_contrib/aviary/src/job/AviaryScheddPlugin.cpp
|
|
|
cad3e37 |
index 644cf71..65d151b 100644
|
|
|
cad3e37 |
--- a/src/condor_contrib/aviary/src/job/AviaryScheddPlugin.cpp
|
|
|
cad3e37 |
+++ b/src/condor_contrib/aviary/src/job/AviaryScheddPlugin.cpp
|
|
|
cad3e37 |
@@ -71,7 +71,7 @@ AviaryScheddPlugin::earlyInitialize()
|
|
|
cad3e37 |
if (!sock) {
|
|
|
cad3e37 |
EXCEPT("Failed to allocate transport socket");
|
|
|
cad3e37 |
}
|
|
|
cad3e37 |
- if (!sock->assign(provider->getListenerSocket())) {
|
|
|
cad3e37 |
+ if (!sock->assignSocket(provider->getListenerSocket())) {
|
|
|
cad3e37 |
EXCEPT("Failed to bind transport socket");
|
|
|
cad3e37 |
}
|
|
|
cad3e37 |
int index;
|
|
|
cad3e37 |
diff --git a/src/condor_contrib/aviary/src/locator/AviaryLocatorPlugin.cpp b/src/condor_contrib/aviary/src/locator/AviaryLocatorPlugin.cpp
|
|
|
cad3e37 |
index bcb7902..7472a76 100644
|
|
|
cad3e37 |
--- a/src/condor_contrib/aviary/src/locator/AviaryLocatorPlugin.cpp
|
|
|
cad3e37 |
+++ b/src/condor_contrib/aviary/src/locator/AviaryLocatorPlugin.cpp
|
|
|
cad3e37 |
@@ -66,7 +66,7 @@ struct AviaryLocatorPlugin : public Service, CollectorPlugin
|
|
|
cad3e37 |
EXCEPT("Failed to allocate transport socket");
|
|
|
cad3e37 |
}
|
|
|
cad3e37 |
|
|
|
cad3e37 |
- if (!sock->assign(provider->getListenerSocket())) {
|
|
|
cad3e37 |
+ if (!sock->assignSocket(provider->getListenerSocket())) {
|
|
|
cad3e37 |
EXCEPT("Failed to bind transport socket");
|
|
|
cad3e37 |
}
|
|
|
cad3e37 |
int index;
|
|
|
cad3e37 |
diff --git a/src/condor_contrib/aviary/src/query/aviary_query_server.cpp b/src/condor_contrib/aviary/src/query/aviary_query_server.cpp
|
|
|
cad3e37 |
index d026d1d..e211d5f 100644
|
|
|
cad3e37 |
--- a/src/condor_contrib/aviary/src/query/aviary_query_server.cpp
|
|
|
cad3e37 |
+++ b/src/condor_contrib/aviary/src/query/aviary_query_server.cpp
|
|
|
cad3e37 |
@@ -84,7 +84,7 @@ void main_init(int /* argc */, char * /* argv */ [])
|
|
|
cad3e37 |
EXCEPT("Failed to allocate transport socket");
|
|
|
cad3e37 |
}
|
|
|
cad3e37 |
|
|
|
cad3e37 |
- if (!sock->assign(provider->getListenerSocket())) {
|
|
|
cad3e37 |
+ if (!sock->assignSocket(provider->getListenerSocket())) {
|
|
|
cad3e37 |
EXCEPT("Failed to bind transport socket");
|
|
|
cad3e37 |
}
|
|
|
cad3e37 |
int index;
|
|
|
cad3e37 |
--
|
|
|
cad3e37 |
2.3.5
|