mirror/ULib
1
0
Fork 0
mirror of https://github.com/stefanocasazza/ULib.git synced 2025-09-28 19:05:55 +08:00
Code Issues Releases Wiki Activity

fix

Browse Source
This commit is contained in:
stefanocasazza 2019-09-20 13:54:44 +02:00
parent 8e683b8233
commit 160bb7832d
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ulib/net/client/redis.cpp
View File

@ -710,7 +710,7 @@ bool UREDISClusterMaster::clusterUnsubscribe(const UString& channel) // unregist
{
U_TRACE(0, "UREDISClusterMaster::clusterUnsubscribe(%V)", channel.rep)
if (subscriptionClient->sendRequest(U_CONSTANT_TO_PARAM("UNSUBSCRIBE "), channel))
if (subscriptionClient->processRequest(U_RC_MULTIBULK, U_CONSTANT_TO_PARAM("UNSUBSCRIBE"), U_STRING_TO_PARAM(channel)))
{
(void)subscriptionClient->UREDISClient_Base::pchannelCallbackMap->erase(channel);
@ -724,7 +724,7 @@ bool UREDISClusterMaster::clusterSubscribe(const UString& channel, vPFcscs callb
{
U_TRACE(0, "UREDISClusterMaster::clusterSubscribe(%V,%p)", channel.rep, callback)
if (subscriptionClient->sendRequest(U_CONSTANT_TO_PARAM("SUBSCRIBE "), channel))
if (subscriptionClient->processRequest(U_RC_MULTIBULK, U_CONSTANT_TO_PARAM("SUBSCRIBE"), U_STRING_TO_PARAM(channel)))
{
subscriptionClient->UREDISClient_Base::pchannelCallbackMap->insert(channel, (const void*)callback);

6
src/ulib/net/server/server.cpp
View File

@ -2414,7 +2414,11 @@ void UServer_Base::loadConfigParam()
if (budp == false)
#endif
{
if (setDocumentRoot(pcfg->at(U_CONSTANT_TO_PARAM("DOCUMENT_ROOT"))) == false) U_ERROR("Setting DOCUMENT ROOT to %V failed", document_root->rep);
x = pcfg->at(U_CONSTANT_TO_PARAM("DOCUMENT_ROOT"));
if (x.empty()) x = U_STRING_FROM_CONSTANT("/var/www");
if (setDocumentRoot(x) == false) U_ERROR("Setting DOCUMENT ROOT to %V failed", document_root->rep);
}
#ifndef U_LOG_DISABLE

2
tests/examples/TSA/tsaserial
View File

@ -1 +1 @@
0619
0620