From 0b568bbfec21777bf989e7f6549a6d7bb48e56e5 Mon Sep 17 00:00:00 2001
From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net>
Date: Sun, 3 Nov 2019 20:00:00 +0700
Subject: [PATCH] [*] Updates
---
CellFrameDashboardService/DapChainDashboardService.cpp | 4 ++--
CellFrameDashboardService/DapChainDashboardService.h | 3 ---
debian/share/init.d/cellframe-dashboard.service | 2 +-
libdap-qt | 2 +-
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/CellFrameDashboardService/DapChainDashboardService.cpp b/CellFrameDashboardService/DapChainDashboardService.cpp
index 4b4dbda50..1f3ca41a5 100755
--- a/CellFrameDashboardService/DapChainDashboardService.cpp
+++ b/CellFrameDashboardService/DapChainDashboardService.cpp
@@ -9,7 +9,7 @@ DapChainDashboardService::DapChainDashboardService() : DapRpcService(nullptr)
connect(m_pDapChainLogHandler, SIGNAL(onChangedLog()), SLOT(changedLogModel()));
m_pDapChainWalletHandler = new DapChainWalletHandler(this);
connect(this, &DapChainDashboardService::onNewClientConnected, [=] {
- qDebug() << "New client";
+ qDebug() << "Frontend connected";
});
m_pDapChainNodeHandler = new DapChainNodeNetworkHandler(this);
@@ -29,8 +29,8 @@ bool DapChainDashboardService::start()
{
qInfo() << "DapChainDashboardService::start()";
- m_pSocketService = new DapUiSocketServer();
m_pServer = new DapUiService();
+ m_pServer->setSocketOptions(QLocalServer::WorldAccessOption );
if(m_pServer->listen(DAP_BRAND))
{
connect(m_pServer, SIGNAL(onClientConnected()), SIGNAL(onNewClientConnected()));
diff --git a/CellFrameDashboardService/DapChainDashboardService.h b/CellFrameDashboardService/DapChainDashboardService.h
index 3e246b76d..bfe15db2e 100755
--- a/CellFrameDashboardService/DapChainDashboardService.h
+++ b/CellFrameDashboardService/DapChainDashboardService.h
@@ -32,7 +32,6 @@
#include <QLocalServer>
typedef class DapRpcLocalServer DapUiService;
-typedef class QLocalServer DapUiSocketServer;
/**
* @brief The DapChainDashboardService class
@@ -53,8 +52,6 @@ class DapChainDashboardService : public DapRpcService
Q_CLASSINFO("serviceName", "RPCServer")
/// Service core.
DapUiService * m_pServer {nullptr};
- /// Socket of client connection with the service.
- DapUiSocketServer * m_pSocketService {nullptr};
/// Recipient logs information
DapChainLogHandler * m_pDapChainLogHandler {nullptr};
/// Recipient wallet information
diff --git a/debian/share/init.d/cellframe-dashboard.service b/debian/share/init.d/cellframe-dashboard.service
index 5216e3304..00da6e14b 100644
--- a/debian/share/init.d/cellframe-dashboard.service
+++ b/debian/share/init.d/cellframe-dashboard.service
@@ -5,7 +5,7 @@ After=network.target
[Service]
Type=forking
OOMScoreAdjust=-1000
-PIDFile=/opt/cellframe-dashboard/CellFrameDashboardService.pid
+#PIDFile=/opt/cellframe-dashboard/CellFrameDashboardService.pid
WorkingDirectory=/opt/cellframe-dashboard/
ExecStart=/opt/cellframe-dashboard/bin/CellFrameDashboardService -D
ExecStop=/opt/cellframe-dashboard/bin/CellFrameDashboardService --stop
diff --git a/libdap-qt b/libdap-qt
index ab606d8b0..96629d270 160000
--- a/libdap-qt
+++ b/libdap-qt
@@ -1 +1 @@
-Subproject commit ab606d8b0fda2218ea4ad760a424008319f76298
+Subproject commit 96629d270265f9b75c8c289b7b2ab45ce8f75df3
--
GitLab