More exception throwing in constructors

[user/henk/code/inspircd.git] / src / modules / m_filter.cpp

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 5b2826f5a1fd65b00b3a8cf18a78d8dabe13a568..c8d5633ffbfc02758557b6df5a90fd32f860343d 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -29,6 +29,15 @@ using namespace std;
 
 /* $ModDesc: An enhanced version of the unreal m_filter.so used by chatspike.net */
 
+class FilterException : public ModuleException
+{
+ public:
+       virtual char* GetReason()
+       {
+               return "Could not find <filter file=\"\"> definition in your config file!";
+       }
+};
+
 class ModuleFilter : public Module
 {
  Server *Srv;
@@ -49,9 +58,8 @@ class ModuleFilter : public Module
                MyConf = new ConfigReader(filterfile);
                if ((filterfile == "") || (!MyConf->Verify()))
                {
-                       printf("Error, could not find <filter file=\"\"> definition in your config file!\n");
-                       log(DEFAULT,"Error, could not find <filter file=\"\"> definition in your config file!");
-                       return;
+                       FilterException e;
+                       throw(e);
                }
                Srv->Log(DEFAULT,std::string("m_filter: read configuration from ")+filterfile);
        }
@@ -134,9 +142,8 @@ class ModuleFilter : public Module
                if ((filterfile == "") || (!MyConf->Verify()))
                {
                        // bail if the user forgot to create a config file
-                       printf("Error, could not find <filter file=\"\"> definition in your config file!");
-                       log(DEFAULT,"Error, could not find <filter file=\"\"> definition in your config file!");
-                       return;
+                       FilterException e;
+                       throw(e);
                }
                Srv->Log(DEFAULT,std::string("m_filter: read configuration from ")+filterfile);
        }