Verbose test reports on failures.

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / rpcconfig.cpp

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
index dca87fbee34ce8a65eb0bc85997c6e57b54ec6cc..df5ae9e4df34540d0da0ea269d1379a03e3d3f83 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
@@ -1,51 +1,45 @@
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-
-#include <cstdlib>
-#include <csignal>
-#include <cerrno>
-#include <cstring>
-#include <vector>
-#include <algorithm>
-#include <ostream> // xmlrpc-c devs have missed something :)
-
-#include "stg/common.h"
-#include "stg/admin.h"
-#include "stg/module_settings.h"
-#include "stg/settings.h"
-#include "stg/plugin_creator.h"
-

 #include "rpcconfig.h"
 #include "rpcconfig.h"

+

 #include "info_methods.h"
 #include "users_methods.h"
 #include "tariffs_methods.h"
 #include "admins_methods.h"
 #include "messages_methods.h"
 
 #include "info_methods.h"
 #include "users_methods.h"
 #include "tariffs_methods.h"
 #include "admins_methods.h"
 #include "messages_methods.h"
 

-namespace
-{
-PLUGIN_CREATOR<RPC_CONFIG> rpcc;
-}
+#include "stg/admins.h"
+#include "stg/admin.h"
+#include "stg/module_settings.h"
+#include "stg/settings.h"
+#include "stg/common.h"
+#include "stg/const.h"

 
 

-extern "C" PLUGIN * GetPlugin();
+#include <algorithm>
+#include <vector>
+#include <ostream> // xmlrpc-c devs have missed something :)
+#include <cstdlib>
+#include <csignal>
+#include <cerrno>
+#include <cstring>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <unistd.h>

 
 RPC_CONFIG_SETTINGS::RPC_CONFIG_SETTINGS()
 
 RPC_CONFIG_SETTINGS::RPC_CONFIG_SETTINGS()

-    : errorStr(),
-      port(0),
+    : port(0),

       cookieTimeout(0)
 {
 }
 
       cookieTimeout(0)
 {
 }
 

-int RPC_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
+int RPC_CONFIG_SETTINGS::ParseSettings(const STG::ModuleSettings & s)

 {
 {

-PARAM_VALUE pv;
+STG::ParamValue pv;

 pv.param = "Port";
 pv.param = "Port";

-std::vector<PARAM_VALUE>::const_iterator pvi;
+std::vector<STG::ParamValue>::const_iterator pvi;

 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);

-if (pvi == s.moduleParams.end())
+if (pvi == s.moduleParams.end() || pvi->value.empty())

     {
     errorStr = "Parameter \'Port\' not found.";
     printfd(__FILE__, "Parameter 'Port' not found\n");
     {
     errorStr = "Parameter \'Port\' not found.";
     printfd(__FILE__, "Parameter 'Port' not found\n");


@@ -62,7 +56,7 @@ port = static_cast<uint16_t>(p);
 
 pv.param = "CookieTimeout";
 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
 
 pv.param = "CookieTimeout";
 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);

-if (pvi == s.moduleParams.end())
+if (pvi == s.moduleParams.end() || pvi->value.empty())

     {
     cookieTimeout = 1800; // 30 * 60
     }
     {
     cookieTimeout = 1800; // 30 * 60
     }


@@ -79,29 +73,22 @@ else
 return 0;
 }
 
 return 0;
 }
 

-PLUGIN * GetPlugin()
+extern "C" STG::Plugin* GetPlugin()

 {
 {

-return rpcc.GetPlugin();
+    static RPC_CONFIG plugin;
+    return &plugin;

 }
 
 RPC_CONFIG::RPC_CONFIG()
 }
 
 RPC_CONFIG::RPC_CONFIG()

-    : errorStr(),
-      rpcConfigSettings(),
-      users(NULL),
+    : users(NULL),

       admins(NULL),
       tariffs(NULL),
       store(NULL),
       admins(NULL),
       tariffs(NULL),
       store(NULL),

-      settings(),

       fd(-1),
       fd(-1),

-      rpcRegistry(),

       rpcServer(NULL),
       rpcServer(NULL),

-      running(false),

       stopped(true),
       stopped(true),

-      tid(),
-      cookies(),

       dayFee(0),
       dayFee(0),

-      dirNames(),
-      logger(GetPluginLogger(GetStgLogger(), "conf_rpc"))
+      logger(STG::PluginLogger::get("conf_rpc"))

 {
 }
 
 {
 }
 


@@ -121,7 +108,7 @@ if (ret)
 return ret;
 }
 
 return ret;
 }
 

-void RPC_CONFIG::SetStgSettings(const SETTINGS * s)
+void RPC_CONFIG::SetStgSettings(const STG::Settings * s)

 {
     dayFee = s->GetDayFee();
     dirNames.erase(dirNames.begin(), dirNames.end());
 {
     dayFee = s->GetDayFee();
     dirNames.erase(dirNames.begin(), dirNames.end());


@@ -133,7 +120,6 @@ void RPC_CONFIG::SetStgSettings(const SETTINGS * s)
 int RPC_CONFIG::Start()
 {
 InitiateRegistry();
 int RPC_CONFIG::Start()
 {
 InitiateRegistry();

-running = true;

 
 fd = socket(AF_INET, SOCK_STREAM, 0);
 if (fd < 0)
 
 fd = socket(AF_INET, SOCK_STREAM, 0);
 if (fd < 0)


@@ -159,7 +145,7 @@ addr.sin_family = AF_INET;
 addr.sin_port = htons(rpcConfigSettings.GetPort());
 addr.sin_addr.s_addr = inet_addr("0.0.0.0");
 
 addr.sin_port = htons(rpcConfigSettings.GetPort());
 addr.sin_addr.s_addr = inet_addr("0.0.0.0");
 

-if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)))
+if (bind(fd, reinterpret_cast<sockaddr *>(&addr), sizeof(addr)))

     {
     logger("Cannot bind the socket: %s", strerror(errno));
     errorStr = "Failed to bind socket";
     {
     logger("Cannot bind the socket: %s", strerror(errno));
     errorStr = "Failed to bind socket";


@@ -182,20 +168,14 @@ rpcServer = new xmlrpc_c::serverAbyss(
         .socketFd(fd)
         );
 
         .socketFd(fd)
         );
 

-if (pthread_create(&tid, NULL, Run, this))
-    {
-    errorStr = "Failed to create RPC thread";
-    logger("Cannot create RPC thread.");
-    printfd(__FILE__, "Failed to crate RPC thread\n");
-    return -1;
-    }
+m_thread = std::jthread([this](auto token){ Run(std::move(token)); });

 
 return 0;
 }
 
 int RPC_CONFIG::Stop()
 {
 
 return 0;
 }
 
 int RPC_CONFIG::Stop()
 {

-running = false;
+m_thread.request_stop();

 for (int i = 0; i < 5 && !stopped; ++i)
     {
     struct timespec ts = {0, 200000000};
 for (int i = 0; i < 5 && !stopped; ++i)
     {
     struct timespec ts = {0, 200000000};


@@ -204,39 +184,33 @@ for (int i = 0; i < 5 && !stopped; ++i)
 
 if (!stopped)
     {
 
 if (!stopped)
     {

-    running = true;
+    m_thread.detach();

     logger("Cannot stop RPC thread.");
     printfd(__FILE__, "Failed to stop RPC thread\n");
     errorStr = "Failed to stop RPC thread";
     return -1;
     }
 else
     logger("Cannot stop RPC thread.");
     printfd(__FILE__, "Failed to stop RPC thread\n");
     errorStr = "Failed to stop RPC thread";
     return -1;
     }
 else

-    {
-    pthread_join(tid, NULL);
-    }
+    m_thread.join();

 
 close(fd);
 
 return 0;
 }
 
 
 close(fd);
 
 return 0;
 }
 

-void * RPC_CONFIG::Run(void * rc)
+void RPC_CONFIG::Run(std::stop_token token)

 {
 sigset_t signalSet;
 sigfillset(&signalSet);
 pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
 
 {
 sigset_t signalSet;
 sigfillset(&signalSet);
 pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
 

-RPC_CONFIG * config = static_cast<RPC_CONFIG *>(rc);
-
-config->stopped = false;
-while (config->running)
+stopped = false;
+while (!token.stop_requested())

     {
     {

-    if (WaitPackets(config->fd))
-        config->rpcServer->runOnce();
+    if (WaitPackets(fd))
+        rpcServer->runOnce();

     }
     }

-config->stopped = true;
-
-return NULL;
+stopped = true;

 }
 
 bool RPC_CONFIG::GetAdminInfo(const std::string & cookie,
 }
 
 bool RPC_CONFIG::GetAdminInfo(const std::string & cookie,


@@ -269,9 +243,9 @@ bool RPC_CONFIG::CheckAdmin(const std::string & login,
                             const std::string & password,
                             std::string * cookie)
 {
                             const std::string & password,
                             std::string * cookie)
 {

-ADMIN * admin = NULL;
+STG::Admin * admin = NULL;

 
 

-if (!admins->Correct(login, password, &admin))
+if (!admins->correct(login, password, &admin))

     {
     logger("Attempt to connect with invalid credentials. Login: %s", login.c_str());
     return true;
     {
     logger("Attempt to connect with invalid credentials. Login: %s", login.c_str());
     return true;


@@ -280,7 +254,7 @@ if (!admins->Correct(login, password, &admin))
 ADMIN_INFO info;
 time(&info.accessTime);
 info.admin = login;
 ADMIN_INFO info;
 time(&info.accessTime);
 info.admin = login;

-info.priviledges = *admin->GetPriv();
+info.priviledges = admin->priv();

 *cookie = GetCookie();
 cookies[*cookie] = info;
 
 *cookie = GetCookie();
 cookies[*cookie] = info;