X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_flashpolicyd.cpp;h=db0eeb1f1ed2ae7effa1c383e496ea1aa17cd61f;hb=625e5435f51650f547f4411441c0b7b958c53d30;hp=d7f9a793b617d696006788a122fe07c9e6df5c85;hpb=97a1d6429a735eb279496df010d04e3f42aa4e22;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_flashpolicyd.cpp b/src/modules/m_flashpolicyd.cpp index d7f9a793b..db0eeb1f1 100644 --- a/src/modules/m_flashpolicyd.cpp +++ b/src/modules/m_flashpolicyd.cpp @@ -97,7 +97,6 @@ class ModuleFlashPD : public Module void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { ConfigTag* tag = ServerInstance->Config->ConfValue("flashpolicyd"); - timeout = tag->getDuration("timeout", 5, 1); std::string file = tag->getString("file"); if (!file.empty()) @@ -109,10 +108,7 @@ class ModuleFlashPD : public Module } catch (CoreException&) { - const std::string error_message = "A file was specified for FlashPD, but it could not be loaded."; - ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, error_message); - ServerInstance->SNO->WriteGlobalSno('a', error_message); - policy_reply.clear(); + throw ModuleException("A file was specified for FlashPD, but it could not be loaded at " + tag->getTagLocation()); } return; } @@ -144,6 +140,7 @@ class ModuleFlashPD : public Module \ \ "; + timeout = tag->getDuration("timeout", 5, 1); } CullResult cull() CXX11_OVERRIDE