Skip to content

Commit 931dd3d

Browse files
GaspardKiriraGaspardKirira
committed
Merge branch 'dev'
2 parents 59328cc + cfea09a commit 931dd3d

4 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎include/vix/websocket/server.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ namespace vix::websocket
168168
*/
169169
void start()
170170
{
171-
vix::utils::Logger::getInstance().log(vix::utils::Logger::Level::INFO,
171+
vix::utils::Logger::getInstance().log(vix::utils::Logger::Level::Info,
172172
"[ws] start() called on port {}", port());
173173
engine_.run();
174174
}

‎src/Metrics.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ namespace vix::websocket
133133
if (ec)
134134
throw std::system_error(ec, "listen");
135135

136-
log.log(vix::utils::Logger::Level::INFO,
136+
log.log(vix::utils::Logger::Level::Info,
137137
"[ws] metrics listening {}:{} (GET /metrics)",
138138
address, port);
139139

@@ -143,7 +143,7 @@ namespace vix::websocket
143143
acceptor.accept(socket, ec);
144144
if (ec)
145145
{
146-
log.log(vix::utils::Logger::Level::DEBUG,
146+
log.log(vix::utils::Logger::Level::Debug,
147147
"[ws] metrics accept error ({})",
148148
ec.message());
149149
continue;
@@ -155,7 +155,7 @@ namespace vix::websocket
155155

156156
if (ec)
157157
{
158-
log.log(vix::utils::Logger::Level::DEBUG,
158+
log.log(vix::utils::Logger::Level::Debug,
159159
"[ws] metrics read error ({})",
160160
ec.message());
161161
boost::system::error_code ignore;
@@ -186,7 +186,7 @@ namespace vix::websocket
186186
http::write(socket, res, ec);
187187
if (ec)
188188
{
189-
log.log(vix::utils::Logger::Level::DEBUG,
189+
log.log(vix::utils::Logger::Level::Debug,
190190
"[ws] metrics write error ({})",
191191
ec.message());
192192
}
@@ -198,7 +198,7 @@ namespace vix::websocket
198198
}
199199
catch (const std::exception &e)
200200
{
201-
log.log(vix::utils::Logger::Level::ERROR,
201+
log.log(vix::utils::Logger::Level::Error,
202202
"[ws] metrics server error ({})",
203203
e.what());
204204
}

‎src/session.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ namespace vix::websocket
9494
{
9595
if (ec)
9696
{
97-
logger.log(Logger::Level::ERROR, "[ws] accept failed ({})", ec.message());
97+
logger.log(Logger::Level::Error, "[ws] accept failed ({})", ec.message());
9898
if (router_)
9999
router_->handle_error(*this, ec);
100100
return;
101101
}
102102

103-
logger.log(Logger::Level::INFO, "[ws] connected");
103+
logger.log(Logger::Level::Info, "[ws] connected");
104104

105105
if (router_)
106106
router_->handle_open(*this);
@@ -128,11 +128,11 @@ namespace vix::websocket
128128
}
129129
else if (is_normal_disconnect(ec))
130130
{
131-
logger.log(Logger::Level::DEBUG, "[ws] disconnected ({})", ec.message());
131+
logger.log(Logger::Level::Debug, "[ws] disconnected ({})", ec.message());
132132
}
133133
else
134134
{
135-
logger.log(Logger::Level::WARN, "[ws] read error ({})", ec.message());
135+
logger.log(Logger::Level::Warn, "[ws] read error ({})", ec.message());
136136
}
137137

138138
if (router_)
@@ -141,7 +141,7 @@ namespace vix::websocket
141141
return;
142142
}
143143

144-
logger.log(Logger::Level::DEBUG, "[ws] recv bytes={}", bytes);
144+
logger.log(Logger::Level::Debug, "[ws] recv bytes={}", bytes);
145145

146146
auto data = beast::buffers_to_string(buffer_.data());
147147
buffer_.consume(buffer_.size());
@@ -181,11 +181,11 @@ namespace vix::websocket
181181

182182
if (ec)
183183
{
184-
logger.log(Logger::Level::WARN, "[ws] idle timer error ({})", ec.message());
184+
logger.log(Logger::Level::Warn, "[ws] idle timer error ({})", ec.message());
185185
return;
186186
}
187187

188-
logger.log(Logger::Level::INFO, "[ws] disconnected (idle timeout)");
188+
logger.log(Logger::Level::Info, "[ws] disconnected (idle timeout)");
189189
close(ws::close_reason(ws::close_code::normal));
190190
}
191191

@@ -274,11 +274,11 @@ namespace vix::websocket
274274
}
275275
else if (is_normal_disconnect(ec))
276276
{
277-
logger.log(Logger::Level::DEBUG, "[ws] disconnected ({})", ec.message());
277+
logger.log(Logger::Level::Debug, "[ws] disconnected ({})", ec.message());
278278
}
279279
else
280280
{
281-
logger.log(Logger::Level::WARN, "[ws] write error ({})", ec.message());
281+
logger.log(Logger::Level::Warn, "[ws] write error ({})", ec.message());
282282
}
283283

284284
closing_ = true;
@@ -287,7 +287,7 @@ namespace vix::websocket
287287
return;
288288
}
289289

290-
logger.log(Logger::Level::DEBUG, "[ws] sent bytes={}", bytes);
290+
logger.log(Logger::Level::Debug, "[ws] sent bytes={}", bytes);
291291
do_write_next();
292292
}
293293

@@ -308,11 +308,11 @@ namespace vix::websocket
308308
}
309309
else if (!ec || is_normal_disconnect(ec))
310310
{
311-
logger.log(Logger::Level::DEBUG, "[ws] disconnected ({})", ec.message());
311+
logger.log(Logger::Level::Debug, "[ws] disconnected ({})", ec.message());
312312
}
313313
else
314314
{
315-
logger.log(Logger::Level::WARN, "[ws] close error ({})", ec.message());
315+
logger.log(Logger::Level::Warn, "[ws] close error ({})", ec.message());
316316
}
317317

318318
if (router_)

‎src/websocket.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ namespace vix::websocket
7979
const int port = coreConfig_.getInt("websocket.port", 9090);
8080
if (port < 1024 || port > 65535)
8181
{
82-
logger.log(Logger::Level::ERROR,
82+
logger.log(Logger::Level::Error,
8383
"[ws] port out of range (1024-65535): {}", port);
8484
throw std::invalid_argument("Invalid WebSocket port");
8585
}
8686

8787
init_acceptor(static_cast<unsigned short>(port));
8888

8989
logger.log(
90-
Logger::Level::DEBUG,
90+
Logger::Level::Debug,
9191
"[ws] config maxMessageSize={} idleTimeout={}s pingInterval={}s",
9292
wsConfig_.maxMessageSize,
9393
wsConfig_.idleTimeout.count(),
@@ -150,7 +150,7 @@ namespace vix::websocket
150150
}
151151
else if (ec && !stopRequested_.load(std::memory_order_relaxed))
152152
{
153-
logger.log(Logger::Level::DEBUG, "[ws] accept error ({})", ec.message());
153+
logger.log(Logger::Level::Debug, "[ws] accept error ({})", ec.message());
154154
}
155155

156156
if (!stopRequested_.load(std::memory_order_relaxed))
@@ -179,11 +179,11 @@ namespace vix::websocket
179179
}
180180
catch (const std::exception &e)
181181
{
182-
logger.log(Logger::Level::ERROR,
182+
logger.log(Logger::Level::Error,
183183
"[ws] io thread {} error ({})", i, e.what());
184184
}
185185

186-
logger.log(Logger::Level::DEBUG,
186+
logger.log(Logger::Level::Debug,
187187
"[ws] io thread {} finished", i); });
188188
}
189189
}

0 commit comments

Comments
 (0)