Skip to content

Commit d23eb9b

Browse files
Polish
1 parent c92d9c8 commit d23eb9b

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Main focus (but not only) of the framework is on *Machine to Machine* (M2M) comm
131131
* [Using Regular Expressions in Routes](#using-regular-expressions-in-routes)
132132

133133
<!-- Created by https://github.com/ekalinin/github-markdown-toc -->
134-
<!-- Added by: runner, at: Tue Apr 29 19:58:21 UTC 2025 -->
134+
<!-- Added by: runner, at: Sun Apr 27 20:13:32 UTC 2025 -->
135135

136136
<!--te-->
137137

src/iot/mqtt/SubProtocol.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,31 +102,31 @@ namespace iot::mqtt {
102102

103103
template <typename WSSubProtocolRole>
104104
void SubProtocol<WSSubProtocolRole>::onConnected() {
105-
LOG(INFO) << getSocketConnection()->getConnectionName() << " WSMQTT: connected:";
105+
LOG(INFO) << getSocketConnection()->getConnectionName() << " WsMqtt: connected:";
106106
iot::mqtt::MqttContext::onConnected();
107107
}
108108

109109
template <typename WSSubProtocolRole>
110110
void SubProtocol<WSSubProtocolRole>::onMessageStart(int opCode) {
111111
if (opCode == web::websocket::SubProtocolContext::OpCode::TEXT) {
112-
LOG(ERROR) << getSocketConnection()->getConnectionName() << " WSMQTT: Wrong Opcode: " << opCode;
112+
LOG(ERROR) << getSocketConnection()->getConnectionName() << " WsMqtt: Wrong Opcode: " << opCode << " (TEXT)";
113113
this->end(true);
114114
} else {
115-
LOG(DEBUG) << getSocketConnection()->getConnectionName() << " WSMQTT: Message START: " << opCode;
115+
LOG(DEBUG) << getSocketConnection()->getConnectionName() << " WsMqtt: Message START: " << opCode << " (BIN)";
116116
}
117117
}
118118

119119
template <typename WSSubProtocolRole>
120120
void SubProtocol<WSSubProtocolRole>::onMessageData(const char* chunk, std::size_t chunkLen) {
121121
data.append(std::string(chunk, chunkLen));
122122

123-
LOG(DEBUG) << getSocketConnection()->getConnectionName() << " WebSocket: Frame Data:\n"
123+
LOG(DEBUG) << getSocketConnection()->getConnectionName() << " WsMqtt: Frame Data:\n"
124124
<< std::string(32, ' ').append(utils::hexDump(std::vector<char>(chunk, chunk + chunkLen), 32));
125125
}
126126

127127
template <typename WSSubProtocolRole>
128128
void SubProtocol<WSSubProtocolRole>::onMessageEnd() {
129-
LOG(DEBUG) << getSocketConnection()->getConnectionName() << " WSMQTT: Message END";
129+
LOG(DEBUG) << getSocketConnection()->getConnectionName() << " WsMqtt: Message END";
130130

131131
buffer.insert(buffer.end(), data.begin(), data.end());
132132
size += data.size();
@@ -144,19 +144,19 @@ namespace iot::mqtt {
144144

145145
template <typename WSSubProtocolRole>
146146
void SubProtocol<WSSubProtocolRole>::onMessageError(uint16_t errnum) {
147-
LOG(ERROR) << getSocketConnection()->getConnectionName() << " WSMQTT: Message error: " << errnum;
147+
LOG(ERROR) << getSocketConnection()->getConnectionName() << " WsMqtt: Message error: " << errnum;
148148
}
149149

150150
template <typename WSSubProtocolRole>
151151
void SubProtocol<WSSubProtocolRole>::onDisconnected() {
152152
iot::mqtt::MqttContext::onDisconnected();
153-
LOG(DEBUG) << getSocketConnection()->getConnectionName() << " WSMQTT: disconnected";
153+
LOG(DEBUG) << getSocketConnection()->getConnectionName() << " WsMqtt: disconnected";
154154
}
155155

156156
template <typename WSSubProtocolRole>
157157
bool SubProtocol<WSSubProtocolRole>::onSignal(int sig) {
158158
bool ret = iot::mqtt::MqttContext::onSignal(sig);
159-
LOG(INFO) << getSocketConnection()->getConnectionName() << " WSMQTT: exit due to '" << strsignal(sig) << "' (SIG"
159+
LOG(INFO) << getSocketConnection()->getConnectionName() << " WsMqtt: exit due to '" << strsignal(sig) << "' (SIG"
160160
<< utils::system::sigabbrev_np(sig) << " = " << sig << ")";
161161

162162
this->sendClose();

src/web/websocket/SubProtocol.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,11 @@ namespace web::websocket {
8080
}
8181

8282
getSocketConnection()->setTimeout(0);
83-
84-
LOG(DEBUG) << getSocketConnection()->getConnectionName() << " Subprotocol '" << name << "': created";
8583
}
8684

8785
template <typename SocketContextUpgrade>
8886
SubProtocol<SocketContextUpgrade>::~SubProtocol() {
8987
pingTimer.cancel();
90-
91-
LOG(DEBUG) << getSocketConnection()->getConnectionName() << " Subprotocol '" << name << "': destroyed";
9288
}
9389

9490
template <typename SocketContextUpgrade>

0 commit comments

Comments
 (0)