bughz/predixy
1
0
Fork 0
mirror of https://github.com/joyieldInc/predixy.git synced 2025-12-24 22:46:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove type in Conf

Browse Source
This commit is contained in:
Yoon 2018-04-13 17:22:14 +09:00
parent a13bb36159
commit bf635bbfab
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Command.cpp
View File

@ -203,8 +203,7 @@ void Command::addCustomCommand(const CustomCommandConf& ccc) {
p->minArgs = ccc.minArgs; p->minArgs = ccc.minArgs;
p->maxArgs = ccc.maxArgs; p->maxArgs = ccc.maxArgs;
p->mode = ccc.mode; p->mode = ccc.mode;
p->type = (Command::Type)ccc.type; p->type = (Command::Type)Sentinel++;
CmdMap[ccc.name] = p; CmdMap[ccc.name] = p;
Sentinel++;
} }

5
src/Conf.cpp
View File

@ -33,9 +33,8 @@ bool ServerConf::parse(ServerConf& s, const char* str)
return !s.addr.empty(); return !s.addr.empty();
} }
void CustomCommandConf::init(CustomCommandConf&c, const char* name, const int type) { void CustomCommandConf::init(CustomCommandConf&c, const char* name) {
c.name = name; c.name = name;
c.type = type;
c.minArgs = 2; c.minArgs = 2;
c.maxArgs = 2; c.maxArgs = 2;
c.mode = Command::Write; c.mode = Command::Write;
@ -381,7 +380,7 @@ void Conf::setCustomCommand(const ConfParser::Node* node)
for (auto p = node->sub; p; p = p->next) { for (auto p = node->sub; p; p = p->next) {
mCustomCommands.push_back(CustomCommandConf{}); mCustomCommands.push_back(CustomCommandConf{});
auto& cc = mCustomCommands.back(); auto& cc = mCustomCommands.back();
CustomCommandConf::init(cc, p->key.c_str(), Command::Sentinel); CustomCommandConf::init(cc, p->key.c_str());
auto s = p->sub; auto s = p->sub;
for (;s ; s = s->next) { for (;s ; s = s->next) {
if (setInt(cc.minArgs, "MinArgs", s, 2)) { if (setInt(cc.minArgs, "MinArgs", s, 2)) {

3
src/Conf.h
View File

@ -97,12 +97,11 @@ struct LatencyMonitorConf
struct CustomCommandConf struct CustomCommandConf
{ {
std::string name; std::string name;
int type;
int minArgs; int minArgs;
int maxArgs; int maxArgs;
int mode; int mode;
static void init(CustomCommandConf &c, const char* name, const int type); static void init(CustomCommandConf &c, const char* name);
}; };
class Conf class Conf