diff options
author | linuxdaemon <linuxdaemon@users.noreply.github.com> | 2018-12-18 19:06:56 -0600 |
---|---|---|
committer | Peter Powell <petpow@saberuk.com> | 2018-12-19 01:06:56 +0000 |
commit | 4fbd6681fedbff9b4cb04cc774f785cbe8b5c35b (patch) | |
tree | 9df58ec3e4cf2c191b4ae0051118606957d89db6 /src/modules/m_chanlog.cpp | |
parent | bf0bf05ac07a4bd0afeba5a276ef86308f0f9e54 (diff) |
Make more modules rehash atomically (#1535)
Have each module validate the values it loads before setting them, so
any errors don't result in partial application of the configs
Diffstat (limited to 'src/modules/m_chanlog.cpp')
-rw-r--r-- | src/modules/m_chanlog.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp index 85e7ca2eb..afe213f61 100644 --- a/src/modules/m_chanlog.cpp +++ b/src/modules/m_chanlog.cpp @@ -33,8 +33,7 @@ class ModuleChanLog : public Module { std::string snomasks; std::string channel; - - logstreams.clear(); + ChanLogTargets newlogs; ConfigTagList tags = ServerInstance->Config->ConfTags("chanlog"); for (ConfigIter i = tags.first; i != tags.second; ++i) @@ -44,16 +43,16 @@ class ModuleChanLog : public Module if (channel.empty() || snomasks.empty()) { - ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Malformed chanlog tag, ignoring"); - continue; + throw ModuleException("Malformed chanlog tag at " + i->second->getTagLocation()); } for (std::string::const_iterator it = snomasks.begin(); it != snomasks.end(); it++) { - logstreams.insert(std::make_pair(*it, channel)); + newlogs.insert(std::make_pair(*it, channel)); ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Logging %c to %s", *it, channel.c_str()); } } + logstreams.swap(newlogs); } |