version 0.3.29

[fms.git] / src / nntp / nntplistener.cpp

diff --git a/src/nntp/nntplistener.cpp b/src/nntp/nntplistener.cpp
index 04fa1e1..a34fc15 100644 (file)
--- a/src/nntp/nntplistener.cpp
+++ b/src/nntp/nntplistener.cpp
@@ -40,6 +40,8 @@ void NNTPListener::run()
 \r
        m_log->debug("NNTPListener::run thread started.");\r
 \r
+       LoadDatabase();\r
+\r
        StartListen();\r
 \r
        do\r
@@ -104,19 +106,22 @@ void NNTPListener::run()
 void NNTPListener::StartListen()\r
 {\r
        \r
-       std::string bindaddresses;\r
        std::vector<std::string> listenaddresses;\r
+       std::string bindaddresses;      \r
        std::string nntpport;\r
-       if(Option::Instance()->Get("NNTPListenPort",nntpport)==false)\r
+       Option option(m_db);\r
+\r
+       if(option.Get("NNTPListenPort",nntpport)==false)\r
        {\r
                nntpport="1119";\r
-               Option::Instance()->Set("NNTPListenPort",nntpport);\r
+               option.Set("NNTPListenPort",nntpport);\r
        }\r
-       if(Option::Instance()->Get("NNTPBindAddresses",bindaddresses)==false)\r
+       if(option.Get("NNTPBindAddresses",bindaddresses)==false)\r
        {\r
                bindaddresses="127.0.0.1";\r
-               Option::Instance()->Set("NNTPBindAddresses",bindaddresses);\r
+               option.Set("NNTPBindAddresses",bindaddresses);\r
        }\r
+\r
        StringFunctions::Split(bindaddresses,",",listenaddresses);\r
        \r
        for(std::vector<std::string>::iterator i=listenaddresses.begin(); i!=listenaddresses.end(); i++)\r