diff options
| author | Adam <Adam@anope.org> | 2010-10-21 23:20:48 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2010-10-21 23:20:48 -0400 |
| commit | 791c2b89a5b09d3e3e3785669b29438ffec26295 (patch) | |
| tree | 60a4647572e80d5f037fe2d9e49338a34cc0d6ea /src/config.cpp | |
| parent | 4f317a242104b623d2e5257bc672fd56c0240a0e (diff) | |
Changed the log:normal config directive to a list like the other log values, and fixed a potential crash from rehashing while sending mail
Diffstat (limited to 'src/config.cpp')
| -rw-r--r-- | src/config.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/config.cpp b/src/config.cpp index 898f9bf70..61dfe7bc0 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -938,7 +938,7 @@ bool InitLogs(ServerConfig *config, const Anope::string &) bool DoLogs(ServerConfig *config, const Anope::string &, const Anope::string *, ValueList &values, int *) { - //{"target", "source", "logage", "inhabit", "admin", "override", "commands", "servers", "channels", "users", "normal", "rawio", "debug"}, + //{"target", "source", "logage", "inhabit", "admin", "override", "commands", "servers", "channels", "users", "other", "rawio", "debug"}, Anope::string targets = values[0].GetValue(); ValueItem vi(targets); if (!ValidateNotEmpty(config, "log", "target", vi)) @@ -953,11 +953,11 @@ bool DoLogs(ServerConfig *config, const Anope::string &, const Anope::string *, Anope::string servers = values[7].GetValue(); Anope::string channels = values[8].GetValue(); Anope::string users = values[9].GetValue(); - bool normal = values[10].GetBool(); + Anope::string normal = values[10].GetValue(); bool rawio = values[11].GetBool(); bool ldebug = values[12].GetBool(); - LogInfo *l = new LogInfo(logage, inhabit, normal, rawio, ldebug); + LogInfo *l = new LogInfo(logage, inhabit, rawio, ldebug); l->Targets = BuildStringList(targets); l->Sources = BuildStringList(source); l->Admin = BuildStringList(admin); @@ -966,6 +966,7 @@ bool DoLogs(ServerConfig *config, const Anope::string &, const Anope::string *, l->Servers = BuildStringList(servers); l->Channels = BuildStringList(channels); l->Users = BuildStringList(users); + l->Normal = BuildStringList(normal); config->LogInfos.push_back(l); @@ -1213,9 +1214,9 @@ void ServerConfig::Read() {DT_CHARPTR}, InitModules, DoModule, DoneModules}, {"log", - {"target", "source", "logage", "inhabitlogchannel", "admin", "override", "commands", "servers", "channels", "users", "normal", "rawio", "debug", ""}, + {"target", "source", "logage", "inhabitlogchannel", "admin", "override", "commands", "servers", "channels", "users", "other", "rawio", "debug", ""}, {"", "", "7", "yes", "", "", "", "", "", "", "no", "no", ""}, - {DT_STRING, DT_STRING, DT_INTEGER, DT_BOOLEAN, DT_STRING, DT_STRING, DT_STRING, DT_STRING, DT_STRING, DT_STRING, DT_BOOLEAN, DT_BOOLEAN, DT_BOOLEAN}, + {DT_STRING, DT_STRING, DT_INTEGER, DT_BOOLEAN, DT_STRING, DT_STRING, DT_STRING, DT_STRING, DT_STRING, DT_STRING, DT_STRING, DT_BOOLEAN, DT_BOOLEAN}, InitLogs, DoLogs, DoneLogs}, {"opertype", {"name", "inherits", "commands", "privs", ""}, |