diff options
Diffstat (limited to 'src/modules/m_flashpolicyd.cpp')
| -rw-r--r-- | src/modules/m_flashpolicyd.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
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 <site-control permitted-cross-domain-policies=\"master-only\"/>\ <allow-access-from domain=\"*\" to-ports=\"" + to_ports + "\" />\ </cross-domain-policy>"; + timeout = tag->getDuration("timeout", 5, 1); } CullResult cull() CXX11_OVERRIDE |