Skip to content

Commit

Permalink
Rename onError -> onStatus
Browse files Browse the repository at this point in the history
  • Loading branch information
@VolkerChristian
VolkerChristian committed Oct 9, 2023
1 parent a336841 commit 9000a7d
Show file tree
Hide file tree
Showing 33 changed files with 171 additions and 171 deletions.
2 changes: 1 addition & 1 deletion src/core/pipe/PipeSource.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ namespace core::pipe {

} // namespace core::pipe

#endif // CORE_PIPE_PIPESOURCE_H
#endif // CORE_PIPE_ PIPESOURCE_H
4 changes: 2 additions & 2 deletions src/core/socket/stream/SocketAcceptor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ namespace core::socket::stream {
const std::function<void(SocketConnection*)>& onConnect,
const std::function<void(SocketConnection*)>& onConnected,
const std::function<void(SocketConnection*)>& onDisconnect,
const std::function<void(const SocketAddress&, core::socket::State)>& onError,
const std::function<void(const SocketAddress&, core::socket::State)>& onStatus,
const std::shared_ptr<Config>& config);

public:
Expand Down Expand Up @@ -87,7 +87,7 @@ namespace core::socket::stream {
std::function<void(SocketConnection*)> onConnected;
std::function<void(SocketConnection*)> onDisconnect;

std::function<void(const SocketAddress&, core::socket::State)> onError = nullptr;
std::function<void(const SocketAddress&, core::socket::State)> onStatus = nullptr;

std::shared_ptr<Config> config;
};
Expand Down
12 changes: 6 additions & 6 deletions src/core/socket/stream/SocketAcceptor.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ namespace core::socket::stream {
const std::function<void(SocketConnection*)>& onConnect,
const std::function<void(SocketConnection*)>& onConnected,
const std::function<void(SocketConnection*)>& onDisconnect,
const std::function<void(const SocketAddress&, core::socket::State)>& onError,
const std::function<void(const SocketAddress&, core::socket::State)>& onStatus,
const std::shared_ptr<Config>& config)
: core::eventreceiver::InitAcceptEventReceiver("SocketAcceptor")
, core::eventreceiver::AcceptEventReceiver("SocketAcceptor", 0)
, socketContextFactory(socketContextFactory)
, onConnect(onConnect)
, onConnected(onConnected)
, onDisconnect(onDisconnect)
, onError(onError)
, onStatus(onStatus)
, config(config) {
InitAcceptEventReceiver::span();
}
Expand Down Expand Up @@ -111,9 +111,9 @@ namespace core::socket::stream {
if (localAddress.useNext()) {
LOG(TRACE) << config->getInstanceName() << ": using next SocketAddress '"
<< config->Local::getSocketAddress().toString() << "'";
new SocketAcceptor(socketContextFactory, onConnect, onConnected, onDisconnect, onError, config);
new SocketAcceptor(socketContextFactory, onConnect, onConnected, onDisconnect, onStatus, config);
} else {
onError(localAddress, state);
onStatus(localAddress, state);
}

if (!isEnabled()) {
Expand All @@ -122,13 +122,13 @@ namespace core::socket::stream {
} catch (const typename SocketAddress::BadSocketAddress& badSocketAddress) {
LOG(ERROR) << config->getInstanceName() << ": " << badSocketAddress.what();

onError(localAddress, badSocketAddress.getState());
onStatus(localAddress, badSocketAddress.getState());
destruct();
}
} else {
LOG(TRACE) << config->getInstanceName() << ": disabled";

onError(localAddress, core::socket::State::DISABLED);
onStatus(localAddress, core::socket::State::DISABLED);
destruct();
}
}
Expand Down
28 changes: 14 additions & 14 deletions src/core/socket/stream/SocketClient.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,15 +149,15 @@ namespace core::socket::stream {
}

private:
void realConnect(const std::function<void(const SocketAddress&, core::socket::State)>& onError,
void realConnect(const std::function<void(const SocketAddress&, core::socket::State)>& onStatus,
unsigned int tries,
double retryTimeoutScale) {
if (core::SNodeC::state() == core::State::RUNNING || core::SNodeC::state() == core::State::INITIALIZED) {
new SocketConnector(
socketContextFactory,
onConnect,
onConnected,
[client = *this, onError](SocketConnection* socketConnection) -> void {
[client = *this, onStatus](SocketConnection* socketConnection) -> void {
client.onDisconnect(socketConnection);

if (client.getConfig().getReconnect()) {
Expand All @@ -166,15 +166,15 @@ namespace core::socket::stream {
LOG(INFO) << "Reconnecting in " << relativeReconnectTimeout << " seconds";

core::timer::Timer::singleshotTimer(
[client, onError]() mutable -> void {
client.realConnect(onError, 0, 1);
[client, onStatus]() mutable -> void {
client.realConnect(onStatus, 0, 1);
},
relativeReconnectTimeout);
}
},
[client = *this, onError, tries, retryTimeoutScale](const SocketAddress& socketAddress,
[client = *this, onStatus, tries, retryTimeoutScale](const SocketAddress& socketAddress,
core::socket::State state) -> void {
onError(socketAddress, state);
onStatus(socketAddress, state);

switch (state) {
case core::socket::State::ERROR:
Expand All @@ -192,8 +192,8 @@ namespace core::socket::stream {
LOG(INFO) << "Retrying in " << relativeRetryTimeout << " seconds";

core::timer::Timer::singleshotTimer(
[client, onError, tries, retryTimeoutScale]() mutable -> void {
client.realConnect(onError, tries + 1, retryTimeoutScale * client.getConfig().getRetryBase());
[client, onStatus, tries, retryTimeoutScale]() mutable -> void {
client.realConnect(onStatus, tries + 1, retryTimeoutScale * client.getConfig().getRetryBase());
},
relativeRetryTimeout);
}
Expand All @@ -209,22 +209,22 @@ namespace core::socket::stream {
}

public:
void connect(const std::function<void(const SocketAddress&, core::socket::State)>& onError) {
realConnect(onError, 0, 1);
void connect(const std::function<void(const SocketAddress&, core::socket::State)>& onStatus) {
realConnect(onStatus, 0, 1);
}

void connect(const SocketAddress& remoteAddress, const std::function<void(const SocketAddress&, core::socket::State)>& onError) {
void connect(const SocketAddress& remoteAddress, const std::function<void(const SocketAddress&, core::socket::State)>& onStatus) {
Super::config->Remote::setSocketAddress(remoteAddress);

connect(onError);
connect(onStatus);
}

void connect(const SocketAddress& remoteAddress,
const SocketAddress& localAddress,
const std::function<void(const SocketAddress&, core::socket::State)>& onError) {
const std::function<void(const SocketAddress&, core::socket::State)>& onStatus) {
Super::config->Local::setSocketAddress(localAddress);

connect(remoteAddress, onError);
connect(remoteAddress, onStatus);
}

std::function<void(SocketConnection*)> setOnConnect(const std::function<void(SocketConnection*)>& onConnect) {
Expand Down
4 changes: 2 additions & 2 deletions src/core/socket/stream/SocketConnector.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ namespace core::socket::stream {
const std::function<void(SocketConnection*)>& onConnect,
const std::function<void(SocketConnection*)>& onConnected,
const std::function<void(SocketConnection*)>& onDisconnect,
const std::function<void(const SocketAddress&, core::socket::State)>& onError,
const std::function<void(const SocketAddress&, core::socket::State)>& onStatus,
const std::shared_ptr<Config>& config);

~SocketConnector() override;
Expand Down Expand Up @@ -87,7 +87,7 @@ namespace core::socket::stream {
std::function<void(SocketConnection*)> onConnected;
std::function<void(SocketConnection*)> onDisconnect;

std::function<void(const SocketAddress&, core::socket::State)> onError;
std::function<void(const SocketAddress&, core::socket::State)> onStatus;

std::shared_ptr<Config> config = nullptr;
};
Expand Down
26 changes: 13 additions & 13 deletions src/core/socket/stream/SocketConnector.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ namespace core::socket::stream {
const std::function<void(SocketConnection*)>& onConnect,
const std::function<void(SocketConnection*)>& onConnected,
const std::function<void(SocketConnection*)>& onDisconnect,
const std::function<void(const SocketAddress&, core::socket::State)>& onError,
const std::function<void(const SocketAddress&, core::socket::State)>& onStatus,
const std::shared_ptr<Config>& config)
: core::eventreceiver::InitConnectEventReceiver("SocketConnector")
, core::eventreceiver::ConnectEventReceiver("SocketConnector", 0)
, socketContextFactory(socketContextFactory)
, onConnect(onConnect)
, onConnected(onConnected)
, onDisconnect(onDisconnect)
, onError(onError)
, onStatus(onStatus)
, config(config) {
InitConnectEventReceiver::span();
}
Expand Down Expand Up @@ -125,28 +125,28 @@ namespace core::socket::stream {
LOG(TRACE) << config->getInstanceName() << ": connect success '" << remoteAddress.toString() << "'";

SocketConnectionFactory(onConnect, onConnected, onDisconnect).create(*physicalSocket, config);
onError(remoteAddress, state);
onStatus(remoteAddress, state);
}

if (!isEnabled()) {
if (remoteAddress.useNext()) {
new SocketConnector(socketContextFactory, onConnect, onConnected, onDisconnect, onError, config);
new SocketConnector(socketContextFactory, onConnect, onConnected, onDisconnect, onStatus, config);
} else {
onError(remoteAddress, state);
onStatus(remoteAddress, state);
}

destruct();
}
} catch (const typename SocketAddress::BadSocketAddress& badSocketAddress) {
LOG(ERROR) << config->getInstanceName() << ": " << badSocketAddress.what();

onError(remoteAddress, badSocketAddress.getState());
onStatus(remoteAddress, badSocketAddress.getState());
destruct();
}
} catch (const typename SocketAddress::BadSocketAddress& badSocketAddress) {
LOG(ERROR) << config->getInstanceName() << ": " << badSocketAddress.what();

onError(remoteAddress, badSocketAddress.getState());
onStatus(remoteAddress, badSocketAddress.getState());
destruct();
}
} else {
Expand All @@ -166,7 +166,7 @@ namespace core::socket::stream {
if (cErrno == 0) {
LOG(TRACE) << config->getInstanceName() << ": connect success '" << remoteAddress.toString() << "'";

onError(remoteAddress, state);
onStatus(remoteAddress, state);
disable();

SocketConnectionFactory(onConnect, onConnected, onDisconnect).create(*physicalSocket, config);
Expand All @@ -177,7 +177,7 @@ namespace core::socket::stream {
LOG(TRACE) << config->getInstanceName() << ": using next SocketAddress '"
<< config->Remote::getSocketAddress().toString() << "'";

new SocketConnector(socketContextFactory, onConnect, onConnected, onDisconnect, onError, config);
new SocketConnector(socketContextFactory, onConnect, onConnected, onDisconnect, onStatus, config);
} else {
utils::PreserveErrno pe(cErrno);

Expand All @@ -197,7 +197,7 @@ namespace core::socket::stream {
break;
}

onError(remoteAddress, state);
onStatus(remoteAddress, state);
}

disable();
Expand All @@ -207,7 +207,7 @@ namespace core::socket::stream {
} else {
PLOG(ERROR) << config->getInstanceName() << ": getsockopt syscall error '" << remoteAddress.toString() << "'";

onError(remoteAddress, core::socket::State::FATAL);
onStatus(remoteAddress, core::socket::State::FATAL);
disable();
}
}
Expand All @@ -230,11 +230,11 @@ namespace core::socket::stream {
LOG(TRACE) << config->getInstanceName() << ": using next SocketAddress '" << config->Remote::getSocketAddress().toString()
<< "'";

new SocketConnector(socketContextFactory, onConnect, onConnected, onDisconnect, onError, config);
new SocketConnector(socketContextFactory, onConnect, onConnected, onDisconnect, onStatus, config);
} else {
LOG(ERROR) << config->getInstanceName() << ": connect timeout '" << remoteAddress.toString() << "'";

onError(remoteAddress, core::socket::State::ERROR);
onStatus(remoteAddress, core::socket::State::ERROR);
}

disable();
Expand Down
4 changes: 2 additions & 2 deletions src/core/socket/stream/SocketReader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace core::socket::stream {
protected:
using PhysicalSocket = PhysicalSocketT;

explicit SocketReader(const std::function<void(int)>& onError,
explicit SocketReader(const std::function<void(int)>& onStatus,
const utils::Timeval& timeout,
std::size_t blockSize,
const utils::Timeval& terminateTimeout);
Expand All @@ -67,7 +67,7 @@ namespace core::socket::stream {
void terminate() final;

private:
std::function<void(int)> onError;
std::function<void(int)> onStatus;

std::vector<char> readBuffer;
std::size_t blockSize = 0;
Expand Down
6 changes: 3 additions & 3 deletions src/core/socket/stream/SocketReader.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
namespace core::socket::stream {

template <typename PhysicalSocket>
SocketReader<PhysicalSocket>::SocketReader(const std::function<void(int)>& onError,
SocketReader<PhysicalSocket>::SocketReader(const std::function<void(int)>& onStatus,
const utils::Timeval& timeout,
std::size_t blockSize,
const utils::Timeval& terminateTimeout)
: core::eventreceiver::ReadEventReceiver("SocketReader", timeout)
, onError(onError)
, onStatus(onStatus)
, terminateTimeout(terminateTimeout) {
setBlockSize(blockSize);
}
Expand Down Expand Up @@ -66,7 +66,7 @@ namespace core::socket::stream {
resume();
}
} else {
onError(errno);
onStatus(errno);
disable();
}
} else {
Expand Down
22 changes: 11 additions & 11 deletions src/core/socket/stream/SocketServer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ namespace core::socket::stream {
}

private:
void realListen(const std::function<void(const SocketAddress&, core::socket::State)>& onError,
void realListen(const std::function<void(const SocketAddress&, core::socket::State)>& onStatus,
unsigned int tries,
double retryTimeoutScale) const {
if (core::SNodeC::state() == core::State::RUNNING || core::SNodeC::state() == core::State::INITIALIZED) {
Expand All @@ -154,9 +154,9 @@ namespace core::socket::stream {
onConnect,
onConnected,
onDisconnect,
[server = *this, onError, tries, retryTimeoutScale](const SocketAddress& socketAddress,
[server = *this, onStatus, tries, retryTimeoutScale](const SocketAddress& socketAddress,
core::socket::State state) -> void {
onError(socketAddress, state);
onStatus(socketAddress, state);

switch (state) {
case core::socket::State::ERROR:
Expand All @@ -174,8 +174,8 @@ namespace core::socket::stream {
LOG(INFO) << "Retrying in " << relativeRetryTimeout << " seconds";

core::timer::Timer::singleshotTimer(
[server, onError, tries, retryTimeoutScale]() mutable -> void {
server.realListen(onError, tries + 1, retryTimeoutScale * server.getConfig().getRetryBase());
[server, onStatus, tries, retryTimeoutScale]() mutable -> void {
server.realListen(onStatus, tries + 1, retryTimeoutScale * server.getConfig().getRetryBase());
},
relativeRetryTimeout);
}
Expand All @@ -191,23 +191,23 @@ namespace core::socket::stream {
}

public:
void listen(const std::function<void(const SocketAddress&, core::socket::State)>& onError) const {
realListen(onError, 0, 1);
void listen(const std::function<void(const SocketAddress&, core::socket::State)>& onStatus) const {
realListen(onStatus, 0, 1);
}

void listen(const SocketAddress& localAddress,
const std::function<void(const SocketAddress&, core::socket::State)>& onError) const {
const std::function<void(const SocketAddress&, core::socket::State)>& onStatus) const {
Super::config->Local::setSocketAddress(localAddress);

listen(onError);
listen(onStatus);
}

void listen(const SocketAddress& localAddress,
int backlog,
const std::function<void(const SocketAddress&, core::socket::State)>& onError) const {
const std::function<void(const SocketAddress&, core::socket::State)>& onStatus) const {
Super::config->Local::setBacklog(backlog);

listen(localAddress, onError);
listen(localAddress, onStatus);
}

std::function<void(SocketConnection*)> setOnConnect(const std::function<void(SocketConnection*)>& onConnect) {
Expand Down
4 changes: 2 additions & 2 deletions src/core/socket/stream/SocketWriter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace core::socket::stream {
protected:
using PhysicalSocket = PhysicalSocketT;

explicit SocketWriter(const std::function<void(int)>& onError,
explicit SocketWriter(const std::function<void(int)>& onStatus,
const utils::Timeval& timeout,
std::size_t blockSize,
const utils::Timeval& terminateTimeout);
Expand All @@ -69,7 +69,7 @@ namespace core::socket::stream {
void terminate() final;

private:
std::function<void(int)> onError;
std::function<void(int)> onStatus;
std::function<void(int)> onShutdown;

std::vector<char> writeBuffer;
Expand Down
Loading

0 comments on commit 9000a7d

Please sign in to comment.