Skip to content

Commit 5cea401

Browse files
treefrogframeworktreefrogframework
committed
updated traceQuery()
1 parent 33226bd commit 5cea401

File tree

5 files changed

+29
-42
lines changed

5 files changed

+29
-42
lines changed

‎src/tdebug.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ void Tf::releaseAppLoggers()
9696
}
9797

9898

99-
void Tf::logging(int priority, const std::string &msg)
99+
void Tf::logging(int priority, const QByteArray &msg)
100100
{
101101
if (stream) {
102-
TLog log(priority, msg.c_str());
102+
TLog log(priority, msg);
103103
stream->writeLog(log);
104104
}
105105
}

‎src/tdebug.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Tf {
1111

1212
T_CORE_EXPORT void setupAppLoggers(TLogger *logger = nullptr); // internal use
1313
T_CORE_EXPORT void releaseAppLoggers(); // internal use
14-
T_CORE_EXPORT void logging(int priority, const std::string &msg);
14+
T_CORE_EXPORT void logging(int priority, const QByteArray &msg);
1515

1616
}
1717

‎src/tglobal.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -237,48 +237,48 @@ template<typename... Args>
237237
void fatal(const std::format_string<Args...> &fmt, Args&&... args)
238238
{
239239
std::string msg = std::format(fmt, std::forward<Args>(args)...);
240-
Tf::logging(Tf::FatalLevel, msg);
240+
Tf::logging(Tf::FatalLevel, QByteArray::fromStdString(msg));
241241
}
242242

243243
template<typename... Args>
244244
void error(const std::format_string<Args...> &fmt, Args&&... args)
245245
{
246246
std::string msg = std::format(fmt, std::forward<Args>(args)...);
247-
Tf::logging(Tf::ErrorLevel, msg);
247+
Tf::logging(Tf::ErrorLevel, QByteArray::fromStdString(msg));
248248
}
249249

250250
template<typename... Args>
251251
void warn(const std::format_string<Args...> &fmt, Args&&... args)
252252
{
253253
std::string msg = std::format(fmt, std::forward<Args>(args)...);
254-
Tf::logging(Tf::WarnLevel, msg);
254+
Tf::logging(Tf::WarnLevel, QByteArray::fromStdString(msg));
255255
}
256256

257257
template<typename... Args>
258258
void info(const std::format_string<Args...> &fmt, Args&&... args)
259259
{
260260
std::string msg = std::format(fmt, std::forward<Args>(args)...);
261-
Tf::logging(Tf::InfoLevel, msg);
261+
Tf::logging(Tf::InfoLevel, QByteArray::fromStdString(msg));
262262
}
263263

264264
template<typename... Args>
265265
void debug(const std::format_string<Args...> &fmt, Args&&... args)
266266
{
267267
std::string msg = std::format(fmt, std::forward<Args>(args)...);
268-
Tf::logging(Tf::DebugLevel, msg);
268+
Tf::logging(Tf::DebugLevel, QByteArray::fromStdString(msg));
269269
}
270270

271271
template<typename... Args>
272272
void trace(const std::format_string<Args...> &fmt, Args&&... args)
273273
{
274274
std::string msg = std::format(fmt, std::forward<Args>(args)...);
275-
Tf::logging(Tf::TraceLevel, msg);
275+
Tf::logging(Tf::TraceLevel, QByteArray::fromStdString(msg));
276276
}
277277

278278
#else
279279

280280
template<typename... Args>
281-
std::string simple_format(const std::string &format, Args&&... args)
281+
QByteArray simple_format(const std::string &format, Args&&... args)
282282
{
283283
QByteArray res;
284284
const size_t len = format.size();
@@ -322,49 +322,49 @@ std::string simple_format(const std::string &format, Args&&... args)
322322
}
323323
res += format[pos++];
324324
}
325-
return res.toStdString();
325+
return res;
326326
}
327327

328328
// Logging for developer
329329
template<typename... Args>
330330
void fatal(const std::string &fmt, Args&&... args)
331331
{
332-
std::string msg = simple_format(std::string(fmt), std::forward<Args>(args)...);
332+
auto msg = simple_format(std::string(fmt), std::forward<Args>(args)...);
333333
Tf::logging(Tf::FatalLevel, msg);
334334
}
335335

336336
template<typename... Args>
337337
void error(const std::string &fmt, Args&&... args)
338338
{
339-
std::string msg = simple_format(std::string(fmt), std::forward<Args>(args)...);
339+
auto msg = simple_format(std::string(fmt), std::forward<Args>(args)...);
340340
Tf::logging(Tf::ErrorLevel, msg);
341341
}
342342

343343
template<typename... Args>
344344
void warn(const std::string &fmt, Args&&... args)
345345
{
346-
std::string msg = simple_format(std::string(fmt), std::forward<Args>(args)...);
346+
auto msg = simple_format(std::string(fmt), std::forward<Args>(args)...);
347347
Tf::logging(Tf::WarnLevel, msg);
348348
}
349349

350350
template<typename... Args>
351351
void info(const std::string &fmt, Args&&... args)
352352
{
353-
std::string msg = simple_format(std::string(fmt), std::forward<Args>(args)...);
353+
auto msg = simple_format(std::string(fmt), std::forward<Args>(args)...);
354354
Tf::logging(Tf::InfoLevel, msg);
355355
}
356356

357357
template<typename... Args>
358358
void debug(const std::string &fmt, Args&&... args)
359359
{
360-
std::string msg = simple_format(std::string(fmt), std::forward<Args>(args)...);
360+
auto msg = simple_format(std::string(fmt), std::forward<Args>(args)...);
361361
Tf::logging(Tf::DebugLevel, msg);
362362
}
363363

364364
template<typename... Args>
365365
void trace(const std::string &fmt, Args&&... args)
366366
{
367-
std::string msg = simple_format(std::string(fmt), std::forward<Args>(args)...);
367+
auto msg = simple_format(std::string(fmt), std::forward<Args>(args)...);
368368
Tf::logging(Tf::TraceLevel, msg);
369369
}
370370

‎src/tsystemglobal.cpp‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ QByteArray queryLogDateTimeFormat;
3434

3535
}
3636

37-
void Tf::tSystemMessage(int priority, const std::string &message)
37+
void Tf::tSystemMessage(int priority, const QByteArray &message)
3838
{
3939
if (!systemLogger) {
4040
return;
4141
}
4242

43-
TLog log(priority, message.c_str());
43+
TLog log(priority, message);
4444
QByteArray buf = TLogger::logToByteArray(log, syslogLayout, syslogDateTimeFormat);
4545
systemLogger->write(buf.data(), buf.length());
4646
}
@@ -131,29 +131,16 @@ void Tf::releaseQueryLogger()
131131
}
132132

133133

134-
void Tf::traceQuery(int duration, const std::string &msg)
134+
void Tf::traceQuery(int duration, const QByteArray &msg)
135135
{
136136
if (sqllogstrm) {
137-
TLog log(-1, msg.c_str(), duration);
137+
TLog log(-1, msg, duration);
138138
QByteArray buf = TLogger::logToByteArray(log, queryLogLayout, queryLogDateTimeFormat);
139139
sqllogstrm->writeLog(buf);
140140
}
141141
}
142142

143143

144-
// void Tf::traceQueryLog(int duration, const char *msg, ...)
145-
// {
146-
// if (sqllogstrm) {
147-
// va_list ap;
148-
// va_start(ap, msg);
149-
// TLog log(-1, QString::vasprintf(msg, ap).toLocal8Bit(), duration);
150-
// QByteArray buf = TLogger::logToByteArray(log, queryLogLayout, queryLogDateTimeFormat);
151-
// sqllogstrm->writeLog(buf);
152-
// va_end(ap);
153-
// }
154-
// }
155-
156-
157144
void Tf::writeQueryLog(const QString &query, bool success, const QSqlError &error, int duration)
158145
{
159146
if (sqllogstrm) {

‎src/tsystemglobal.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@ class QSqlError;
1111
namespace Tf {
1212
T_CORE_EXPORT void setupSystemLogger(TSystemLogger *logger = nullptr); // internal use
1313
T_CORE_EXPORT void releaseSystemLogger(); // internal use
14-
T_CORE_EXPORT void tSystemMessage(int priority, const std::string &message); // internal use
14+
T_CORE_EXPORT void tSystemMessage(int priority, const QByteArray &message); // internal use
1515
T_CORE_EXPORT void setupAccessLogger(); // internal use
1616
T_CORE_EXPORT void releaseAccessLogger(); // internal use
1717
T_CORE_EXPORT bool isAccessLoggerAvailable(); // internal use
1818
T_CORE_EXPORT void setupQueryLogger(); // internal use
1919
T_CORE_EXPORT void releaseQueryLogger(); // internal use
2020
T_CORE_EXPORT void writeAccessLog(const TAccessLog &log); // write access log
2121
T_CORE_EXPORT void writeQueryLog(const QString &query, bool success, const QSqlError &error, int duration);
22-
T_CORE_EXPORT void traceQuery(int duration, const std::string &msg);
22+
T_CORE_EXPORT void traceQuery(int duration, const QByteArray &msg);
2323

2424
#ifdef TF_HAVE_STD_FORMAT // std::format
2525

2626
template<typename... Args>
2727
void traceQueryLog(int duration, const std::format_string<Args...> &fmt, Args&&... args)
2828
{
2929
auto msg = std::format(fmt, std::forward<Args>(args)...);
30-
traceQuery(duration, msg);
30+
traceQuery(duration, QByteArray::fromStdString(msg));
3131
}
3232

3333
#else
@@ -59,36 +59,36 @@ template<typename... Args>
5959
void tSystemError(const std::format_string<Args...> &fmt, Args&&... args)
6060
{
6161
std::string msg = std::format(fmt, std::forward<Args>(args)...);
62-
Tf::tSystemMessage((int)Tf::ErrorLevel, msg);
62+
Tf::tSystemMessage((int)Tf::ErrorLevel, QByteArray::fromStdString(msg));
6363
}
6464

6565
template<typename... Args>
6666
void tSystemWarn(const std::format_string<Args...> &fmt, Args&&... args)
6767
{
6868
std::string msg = std::format(fmt, std::forward<Args>(args)...);
69-
Tf::tSystemMessage((int)Tf::WarnLevel, msg);
69+
Tf::tSystemMessage((int)Tf::WarnLevel, QByteArray::fromStdString(msg));
7070
}
7171

7272
template<typename... Args>
7373
void tSystemInfo(const std::format_string<Args...> &fmt, Args&&... args)
7474
{
7575
auto msg = std::format(fmt, std::forward<Args>(args)...);
76-
Tf::tSystemMessage((int)Tf::InfoLevel, msg);
76+
Tf::tSystemMessage((int)Tf::InfoLevel, QByteArray::fromStdString(msg));
7777
}
7878

7979
#else
8080

8181
template<typename... Args>
8282
void tSystemError(const std::string &fmt, Args&&... args)
8383
{
84-
std::string msg = Tf::simple_format(std::string(fmt), std::forward<Args>(args)...);
84+
auto msg = Tf::simple_format(std::string(fmt), std::forward<Args>(args)...);
8585
Tf::tSystemMessage((int)Tf::ErrorLevel, msg);
8686
}
8787

8888
template<typename... Args>
8989
void tSystemWarn(const std::string &fmt, Args&&... args)
9090
{
91-
std::string msg = Tf::simple_format(std::string(fmt), std::forward<Args>(args)...);
91+
auto msg = Tf::simple_format(std::string(fmt), std::forward<Args>(args)...);
9292
Tf::tSystemMessage((int)Tf::WarnLevel, msg);
9393
}
9494

0 commit comments

Comments
 (0)