Skip to content

Add desc to server timing #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kambizzandi merged 4 commits into from
May 26, 2022
Merged

Add desc to server timing #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a72300c
working on timing
kambizzandi May 26, 2022
2f5b0d8
401 changed to 404 for withdrawal and transfer
kambizzandi May 26, 2022
eb86e64
mig file ready for commit
kambizzandi May 26, 2022
455ea3e
desc added to server timing
kambizzandi May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 31 additions & 12 deletions App/Server/clsRequestHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,14 +264,30 @@ const qhttp::TStatusCode StatusCodeOnMethod[] = {
qhttp::ESTATUS_EXPECTATION_FAILED, ///< EHTTP_UNLINK = 32,
};

void clsRequestHandler::addToTimings(const QString &_label, quint64 _nanoSecs) {
if (this->ServerTimings.contains(_label))
this->ServerTimings[_label] += _nanoSecs;
void clsRequestHandler::addToTimings(const QString &_name, const QString &_desc, quint64 _nanoSecs) {
//add overal
if (this->ServerTimings.contains(_name))
this->ServerTimings[_name] += _nanoSecs;
else
this->ServerTimings[_label] = _nanoSecs;
this->ServerTimings.insert(_name, _nanoSecs);

//add for desc
if (_desc.isEmpty() == false) {
QString Label = _name + ";desc=\"" + _desc + "\"";

if (this->ServerTimings.contains(Label))
this->ServerTimings[Label] += _nanoSecs;
else
this->ServerTimings.insert(Label, _nanoSecs);
}
}

void clsRequestHandler::addToTimings(const QString &_name, quint64 _nanoSecs) {
this->addToTimings(_name, "", _nanoSecs);
}

void clsRequestHandler::sendTimingsToResponse() {
#ifdef QT_DEBUG
this->addToTimings("total", this->ElapsedTimer.nsecsElapsed());

// this->Response->addHeaderValue("Access-Control-Expose-Headers", QStringLiteral("x-debug-time-elapsed"));
Expand All @@ -281,18 +297,18 @@ void clsRequestHandler::sendTimingsToResponse() {

for (QMap<QString, quint64>::const_iterator it = this->ServerTimings.constBegin();
it != this->ServerTimings.constEnd();
it ++
it++
) {
Output.append(QString("%1;dur=%2").arg(it.key()).arg(ceil(it.value() / 1000.0) / 1000));
}

this->Response->addHeaderValue("Server-Timing", Output.join(", "));

TargomanLogInfo(7, " "
<< "Server-Timing"
<< " : "
<< Output.join(", ")
);
TargomanLogInfo(7, "Server-Timing"
<< " : "
<< Output.join(", ")
);
#endif
}

clsRequestHandler::stuResult clsRequestHandler::run(
Expand All @@ -303,8 +319,8 @@ clsRequestHandler::stuResult clsRequestHandler::run(
) {
// QVariantMap ResponseHeaders;

auto FNTiming = [=](const QString &_label, quint64 _nanoSecs) {
this->addToTimings(_label, _nanoSecs);
auto FNTiming = [=](const QString &_name, const QString &_desc, quint64 _nanoSecs) {
this->addToTimings(_name, _desc, _nanoSecs);
};

QScopedPointer<intfAPICallBoom> APICALLBOOM;
Expand All @@ -326,6 +342,8 @@ clsRequestHandler::stuResult clsRequestHandler::run(
TAPI::JWT_t JWT;

if (_apiObject->requiresJWT()) {
auto ServerTiming = APICALLBOOM->createScopeTiming("jwt");

QString Auth = Headers.value("authorization");
if (Auth.startsWith("Bearer ")) {
QString BearerToken = Auth.mid(sizeof("Bearer"));
Expand All @@ -338,6 +356,7 @@ clsRequestHandler::stuResult clsRequestHandler::run(
JWT
);
} catch (exJWTExpired &exp) {
auto ServerTiming = APICALLBOOM->createScopeTiming("jwt", "renew");
bool IsRenewed = false;
QString NewToken = Authentication::renewExpiredJWT(
JWT,
Expand Down
3 changes: 2 additions & 1 deletion App/Server/clsRequestHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ class clsRequestHandler : public QObject
QObject *_parent = nullptr);

void process(const QString& _api);
void addToTimings(const QString &_label, quint64 _nanoSecs);
void addToTimings(const QString &_name, quint64 _nanoSecs);
void addToTimings(const QString &_name, const QString &_desc, quint64 _nanoSecs);
void sendTimingsToResponse();

public:
Expand Down
86 changes: 45 additions & 41 deletions Interfaces/AAA/Accounting_Defs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,26 +382,28 @@ namespace tblAccountProductsBase {
TARGOMAN_CREATE_CONSTEXPR(prdCreationDateTime);
TARGOMAN_CREATE_CONSTEXPR(prdUpdatedBy_usrID);

inline QStringList ColumnNames() {
inline QStringList ColumnNames(QString _tableAlias = "") {
if (_tableAlias.isEmpty() == false)
_tableAlias += ".";
return {
prdID,
prdCode,
prdName,
prdDesc,
prdValidFromDate,
prdValidToDate,
prdValidFromHour,
prdValidToHour,
prdPrivs,
prdVAT,
prdInStockQty,
prdOrderedQty,
prdReturnedQty,
_tableAlias + prdID,
_tableAlias + prdCode,
_tableAlias + prdName,
_tableAlias + prdDesc,
_tableAlias + prdValidFromDate,
_tableAlias + prdValidToDate,
_tableAlias + prdValidFromHour,
_tableAlias + prdValidToHour,
_tableAlias + prdPrivs,
_tableAlias + prdVAT,
_tableAlias + prdInStockQty,
_tableAlias + prdOrderedQty,
_tableAlias + prdReturnedQty,
// prdRemainingCount = prdInStockQty - (prdOrderedQty - prdReturnedQty)
prdStatus,
prdCreatedBy_usrID,
prdCreationDateTime,
prdUpdatedBy_usrID,
_tableAlias + prdStatus,
_tableAlias + prdCreatedBy_usrID,
_tableAlias + prdCreationDateTime,
_tableAlias + prdUpdatedBy_usrID,
};
}

Expand Down Expand Up @@ -436,30 +438,32 @@ namespace tblAccountSaleablesBase {
TARGOMAN_CREATE_CONSTEXPR(slbCreationDateTime);
TARGOMAN_CREATE_CONSTEXPR(slbUpdatedBy_usrID);

inline QStringList ColumnNames() {
inline QStringList ColumnNames(QString _tableAlias = "") {
if (_tableAlias.isEmpty() == false)
_tableAlias += ".";
return {
slbID,
slb_prdID,
slbCode,
slbName,
slbDesc,
slbType,
slbAvailableFromDate,
slbAvailableToDate,
slbPrivs,
slbBasePrice,
slbAdditives,
// slbProductCount, //what is this?
slbMaxSaleCountPerUser,
slbInStockQty,
slbOrderedQty,
slbReturnedQty,
// slbRemainingCount = slbInStockQty - (slbOrderedQty - slbReturnedQty)
slbVoucherTemplate,
slbStatus,
slbCreatedBy_usrID,
slbCreationDateTime,
slbUpdatedBy_usrID,
_tableAlias + slbID,
_tableAlias + slb_prdID,
_tableAlias + slbCode,
_tableAlias + slbName,
_tableAlias + slbDesc,
_tableAlias + slbType,
_tableAlias + slbAvailableFromDate,
_tableAlias + slbAvailableToDate,
_tableAlias + slbPrivs,
_tableAlias + slbBasePrice,
_tableAlias + slbAdditives,
// _tableAlias + slbProductCount, //what is this?
_tableAlias + slbMaxSaleCountPerUser,
_tableAlias + slbInStockQty,
_tableAlias + slbOrderedQty,
_tableAlias + slbReturnedQty,
// _tableAlias + slbRemainingCount = slbInStockQty - (slbOrderedQty - slbReturnedQty)
_tableAlias + slbVoucherTemplate,
_tableAlias + slbStatus,
_tableAlias + slbCreatedBy_usrID,
_tableAlias + slbCreationDateTime,
_tableAlias + slbUpdatedBy_usrID,
};
}

Expand Down
Loading