private/apostol-dm
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Committing updates.

Browse Source
This commit is contained in:
Преподобный Ален
2022-07-01 14:50:42 +03:00
parent bfcfe3121d
commit 1e5b7e457a
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/Workers/WebService/WebService.cpp
View File

@@ -1167,7 +1167,9 @@ namespace Apostol {
if (!caOrigin.IsEmpty())
pProxyRequest->AddHeader("Origin", caOrigin);
AConnection->UpdateTimeOut(Now(), 60);
AConnection->CloseConnection(false);
pProxy->Active(true);
}
//--------------------------------------------------------------------------------------------------------------
@@ -1355,11 +1357,11 @@ namespace Apostol {
}
} catch (std::exception &e) {
CHTTPReply::CStatusType LStatus = CHTTPReply::internal_server_error;
CHTTPReply::CStatusType status = CHTTPReply::internal_server_error;
ExceptionToJson(0, e, pReply->Content);
AConnection->SendReply(LStatus);
AConnection->SendReply(status);
Log()->Error(APP_LOG_EMERG, 0, e.what());
}
}

12
src/modules/Workers/WebSocket/WebSocket.cpp
View File

@@ -225,7 +225,7 @@ namespace Apostol {
//--------------------------------------------------------------------------------------------------------------
CWebSocketClient *CWebSocketModule::GetWebSocketClient(CClientContext &Context) {
auto pClient = Context.ClientManager().Add(&Context, CLocation(Context.URL().Origin() + "/session/" + Context.Session()));
auto pClient = Context.ClientManager().Add(&Context, CLocation(Context.URL().Origin() + "/module/" + Context.Session()));
pClient->Session() = Context.Session();
@@ -662,14 +662,12 @@ namespace Apostol {
for (int i = 0; i < m_Servers.Count(); i++) {
auto &Context = m_Servers[i].Value();
if ((Now >= Context.CheckDate())) {
if ((Now >= Context.CheckDate()) && (Context.Status() >= Context::csInitialized)) {
Context.SetCheckDate(Now + (CDateTime) 30 / SecsPerDay); // 30 sec
if (Context.Status() == Context::csInitialized) {
Context.SetStatus(Context::csAuthorization);
Context.SetStatus(Context::csAuthorization);
CheckProviders(Now, Context);
FetchProviders(Now, Context);
}
CheckProviders(Now, Context);
FetchProviders(Now, Context);
}
if (Context.Status() == Context::csAuthorized) {