version 0.3.29

[fms.git] / src / freenet / unkeyedidcreator.cpp

diff --git a/src/freenet/unkeyedidcreator.cpp b/src/freenet/unkeyedidcreator.cpp
index df46469..53f6c0e 100644 (file)
--- a/src/freenet/unkeyedidcreator.cpp
+++ b/src/freenet/unkeyedidcreator.cpp
@@ -1,18 +1,20 @@
 #include "../../include/freenet/unkeyedidcreator.h"\r
 #include "../../include/stringfunctions.h"\r
 \r
+#include <Poco/Timestamp.h>\r
+\r
 #include <sstream>\r
 \r
 #ifdef XMEM\r
        #include <xmem.h>\r
 #endif\r
 \r
-UnkeyedIDCreator::UnkeyedIDCreator()\r
+UnkeyedIDCreator::UnkeyedIDCreator(SQLite3DB::DB *db):IDatabase(db)\r
 {\r
        Initialize();\r
 }\r
 \r
-UnkeyedIDCreator::UnkeyedIDCreator(FCPv2 *fcp):IFCPConnected(fcp)\r
+UnkeyedIDCreator::UnkeyedIDCreator(SQLite3DB::DB *db, FCPv2::Connection *fcp):IDatabase(db),IFCPConnected(fcp)\r
 {\r
        Initialize();\r
 }\r
@@ -40,21 +42,21 @@ void UnkeyedIDCreator::CheckForUnkeyedID()
                long id=rs.GetInt(0);\r
                idstr << id;\r
 \r
-               FCPMessage message;\r
+               FCPv2::Message message;\r
                message.SetName("GenerateSSK");\r
                message["Identifier"]="UnkeyedIDRequest|"+idstr.str();\r
-               m_fcp->SendMessage(message);\r
+               m_fcp->Send(message);\r
 \r
                m_waiting=true;\r
 \r
        }\r
 \r
        // set last checked time to now\r
-       m_lastchecked.SetToGMTime();\r
+       m_lastchecked=Poco::Timestamp();\r
 \r
 }\r
 \r
-const bool UnkeyedIDCreator::HandleMessage(FCPMessage &message)\r
+const bool UnkeyedIDCreator::HandleMessage(FCPv2::Message &message)\r
 {\r
        if(message["Identifier"].find("UnkeyedIDRequest")==0)\r
        {\r
@@ -75,7 +77,7 @@ const bool UnkeyedIDCreator::HandleMessage(FCPMessage &message)
                                SaveKeys(id,message["RequestURI"],message["InsertURI"]);\r
                        }\r
 \r
-                       m_log->WriteLog(LogFile::LOGLEVEL_INFO,__FUNCTION__" received keypair");\r
+                       m_log->information("UnkeyedIDCreator::HandleMessage received keypair");\r
 \r
                        m_waiting=false;\r
 \r
@@ -90,16 +92,15 @@ const bool UnkeyedIDCreator::HandleMessage(FCPMessage &message)
 void UnkeyedIDCreator::Initialize()\r
 {\r
        m_waiting=false;\r
-       m_lastchecked.SetToGMTime();\r
+       m_lastchecked=Poco::Timestamp();\r
 }\r
 \r
 void UnkeyedIDCreator::Process()\r
 {\r
-       DateTime now;\r
-       now.SetToGMTime();\r
+       Poco::DateTime now;\r
 \r
        // only perform check every minute (1/1440 of 1 day)\r
-       if(m_waiting==false && m_lastchecked<(now-(1.0/1440.0)))\r
+       if(m_waiting==false && m_lastchecked<(now-Poco::Timespan(0,0,1,0,0)))\r
        {\r
                CheckForUnkeyedID();\r
        }\r