Better error reporting from plugin runner.

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / configproto.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
index d28ece173c4aba4ecd6d5d50b764d6c17528b068..7052ecc2d394d4fd3ad88abe98ca9bca56837365 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
@@ -22,6 +22,14 @@
 
 #include "conn.h"
 
 
 #include "conn.h"
 

+#include "parser_server_info.h"
+#include "parser_admins.h"
+#include "parser_tariffs.h"
+#include "parser_users.h"
+#include "parser_message.h"
+#include "parser_user_info.h"
+#include "parser_auth_by.h"
+

 #include "stg/common.h"
 #include "stg/logger.h"
 
 #include "stg/common.h"
 #include "stg/logger.h"
 


@@ -37,6 +45,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
 

+namespace SP = STG::PARSER;
+

 namespace
 {
 
 namespace
 {
 


@@ -68,6 +78,10 @@ CONFIGPROTO::CONFIGPROTO(PLUGIN_LOGGER & l)
       m_stopped(true),
       m_logger(l),
       m_listenSocket(-1)
       m_stopped(true),
       m_logger(l),
       m_listenSocket(-1)

+{
+}
+
+CONFIGPROTO::~CONFIGPROTO()

 {
     std::for_each(m_conns.begin(), m_conns.end(), RemoveConn());
 }
 {
     std::for_each(m_conns.begin(), m_conns.end(), RemoveConn());
 }


@@ -119,6 +133,8 @@ int CONFIGPROTO::Prepare()
         return -1;
     }
 
         return -1;
     }
 

+    RegisterParsers();
+

     m_running = true;
     m_stopped = false;
     return 0;
     m_running = true;
     m_stopped = false;
     return 0;


@@ -174,6 +190,40 @@ void CONFIGPROTO::Run()
     m_stopped = true;
 }
 
     m_stopped = true;
 }
 

+void CONFIGPROTO::RegisterParsers()
+{
+    assert(m_settings != NULL);
+    assert(m_store != NULL);
+    assert(m_admins != NULL);
+    assert(m_users != NULL);
+    assert(m_tariffs != NULL);
+
+    SP::GET_SERVER_INFO::FACTORY::Register(m_registry, *m_settings, *m_users, *m_tariffs);
+
+    SP::GET_ADMINS::FACTORY::Register(m_registry, *m_admins);
+    SP::ADD_ADMIN::FACTORY::Register(m_registry, *m_admins);
+    SP::DEL_ADMIN::FACTORY::Register(m_registry, *m_admins);
+    SP::CHG_ADMIN::FACTORY::Register(m_registry, *m_admins);
+
+    SP::GET_TARIFFS::FACTORY::Register(m_registry, *m_tariffs);
+    SP::ADD_TARIFF::FACTORY::Register(m_registry, *m_tariffs);
+    SP::DEL_TARIFF::FACTORY::Register(m_registry, *m_tariffs, *m_users);
+    SP::CHG_TARIFF::FACTORY::Register(m_registry, *m_tariffs);
+
+    SP::GET_USERS::FACTORY::Register(m_registry, *m_users);
+    SP::GET_USER::FACTORY::Register(m_registry, *m_users);
+    SP::ADD_USER::FACTORY::Register(m_registry, *m_users);
+    SP::DEL_USER::FACTORY::Register(m_registry, *m_users);
+    SP::CHG_USER::FACTORY::Register(m_registry, *m_users, *m_store, *m_tariffs);
+    SP::CHECK_USER::FACTORY::Register(m_registry, *m_users);
+
+    SP::SEND_MESSAGE::FACTORY::Register(m_registry, *m_users);
+
+    SP::AUTH_BY::FACTORY::Register(m_registry, *m_users);
+
+    SP::USER_INFO::FACTORY::Register(m_registry, *m_users);
+}
+

 int CONFIGPROTO::MaxFD() const
 {
     int maxFD = m_listenSocket;
 int CONFIGPROTO::MaxFD() const
 {
     int maxFD = m_listenSocket;


@@ -225,14 +275,18 @@ void CONFIGPROTO::AcceptConnection()
         return;
     }
 
         return;
     }
 

-    assert(m_settings != NULL);

     assert(m_admins != NULL);
     assert(m_admins != NULL);

-    assert(m_users != NULL);
-    assert(m_tariffs != NULL);

 
 

-    m_conns.push_back(new STG::Conn(*m_settings, *m_admins, *m_users, *m_tariffs, sock, outerAddr));
-
-    printfd(__FILE__, "New connection from %s:%d\n", inet_ntostring(m_conns.back()->IP()).c_str(), m_conns.back()->Port());
+    try
+    {
+        m_conns.push_back(new STG::Conn(m_registry, *m_admins, sock, outerAddr));
+        printfd(__FILE__, "New connection from %s:%d\n", inet_ntostring(m_conns.back()->IP()).c_str(), m_conns.back()->Port());
+    }
+    catch (const STG::Conn::Error & error)
+    {
+        // Unlikely.
+        m_logger(std::string("Failed to create new client connection: '") + error.what() + "'.");
+    }

 }
 /*
 void CONFIGPROTO::WriteLogAccessFailed(uint32_t ip)
 }
 /*
 void CONFIGPROTO::WriteLogAccessFailed(uint32_t ip)