GithubStar/workflow
1
0
Fork 0
mirror of https://github.com/sogou/workflow.git synced 2026-10-17 04:31:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/sogou/workflow into nossl

Browse Source
This commit is contained in:
Xie Han
2024-08-30 20:42:50 +08:00
parent 727949af31 4c39519283
commit 62094e6a90
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/WFRedisSubscriber.h
+5
View File
@@ -92,6 +92,11 @@ public:
return this->sync_send("PING", { });
}
int quit()
{
return this->sync_send("QUIT", { });
}
public:
/* All 'timeout' proxy functions can only be called only before
the task is started or in 'extract'. */
src/factory/RedisTaskImpl.cc
+9 -17
View File
@@ -72,6 +72,7 @@ bool ComplexRedisTask::check_request()
if (this->req.get_command(command) &&
(strcasecmp(command.c_str(), "AUTH") == 0 ||
strcasecmp(command.c_str(), "SELECT") == 0 ||
strcasecmp(command.c_str(), "RESET") == 0 ||
strcasecmp(command.c_str(), "ASKING") == 0))
{
this->state = WFT_STATE_TASK_ERROR;
@@ -362,28 +363,19 @@ ComplexRedisSubscribeTask::SubscribeWrapper::next_in(ProtocolMessage *message)
{
redis_reply_t *reply = ((RedisResponse *)message)->result_ptr();
if (reply->type == REDIS_REPLY_TYPE_ARRAY && reply->elements == 3 &&
reply->element[0]->type == REDIS_REPLY_TYPE_STRING)
{
const char *str = reply->element[0]->str;
size_t len = reply->element[0]->len;
if ((len == 11 && strncasecmp(str, "unsubscribe", 11)) == 0 ||
(len == 12 && strncasecmp(str, "punsubscribe", 12) == 0))
{
if (reply->element[2]->type == REDIS_REPLY_TYPE_INTEGER &&
reply->element[2]->integer == 0)
{
task_->finished_ = true;
}
}
}
else if (!task_->watching_)
if (reply->type != REDIS_REPLY_TYPE_ARRAY)
{
task_->finished_ = true;
return NULL;
}
if (reply->elements == 3 &&
reply->element[2]->type == REDIS_REPLY_TYPE_INTEGER &&
reply->element[2]->integer == 0)
{
task_->finished_ = true;
}
task_->watching_ = true;
task_->extract_(task_);