From 71d0d678f62e0771ce89c4881f21fff042b4aab9 Mon Sep 17 00:00:00 2001
From: Constantin Papizh <p.const@bk.ru>
Date: Fri, 8 Nov 2019 16:14:48 +0300
Subject: [PATCH] logging and console issues
---
CellFrameDashboardGUI/main.cpp | 1 +
CellFrameDashboardService/CellFrameDashboardService.pro | 1 +
CellFrameDashboardService/main.cpp | 3 +++
libdap | 2 +-
libdap-qt | 2 +-
5 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/CellFrameDashboardGUI/main.cpp b/CellFrameDashboardGUI/main.cpp
index f79f1d603..e466e6896 100755
--- a/CellFrameDashboardGUI/main.cpp
+++ b/CellFrameDashboardGUI/main.cpp
@@ -44,6 +44,7 @@ int main(int argc, char *argv[])
//#ifndef QT_DEBUG
#ifdef Q_OS_LINUX
dapLogger.setLogFile(QString("/opt/cellframe-dashboard/log/%1Gui.log").arg(DAP_BRAND));
+ #elif defined Q_OS_WIN
#endif
//#endif
diff --git a/CellFrameDashboardService/CellFrameDashboardService.pro b/CellFrameDashboardService/CellFrameDashboardService.pro
index e94ef6265..a83665443 100755
--- a/CellFrameDashboardService/CellFrameDashboardService.pro
+++ b/CellFrameDashboardService/CellFrameDashboardService.pro
@@ -19,6 +19,7 @@ VER_PAT = 4
ICON = icon.ico
win32 {
+ CONFIG -= console
VERSION = $${VER_MAJ}.$${VER_MIN}.$$VER_PAT
DEFINES += CLI_PATH=\\\"./cellframe-node-cli.exe\\\"
DEFINES += LOG_FILE=\\\"./opt/cellframe-node/var/log/cellframe-node_logs.txt\\\"
diff --git a/CellFrameDashboardService/main.cpp b/CellFrameDashboardService/main.cpp
index af8c77162..122263542 100755
--- a/CellFrameDashboardService/main.cpp
+++ b/CellFrameDashboardService/main.cpp
@@ -39,6 +39,9 @@ int main(int argc, char *argv[])
//#ifndef QT_DEBUG
#ifdef Q_OS_LINUX
dapLogger.setLogFile(QString("/opt/cellframe-dashboard/log/%1Service.log").arg(DAP_BRAND));
+ #elif defined Q_OS_WIN
+ dapLogger.setLogFile(QString("%1Service.log").arg(DAP_BRAND));
+ dapLogger.setLogLevel(L_INFO);
#endif
//#endif
// Creating the main application object
diff --git a/libdap b/libdap
index ba3e1eed7..ffbc1f0f6 160000
--- a/libdap
+++ b/libdap
@@ -1 +1 @@
-Subproject commit ba3e1eed7b6e76393c035986fe27c8e49cafc2d9
+Subproject commit ffbc1f0f61cc6b50a85481cd2f9af98dab904a9e
diff --git a/libdap-qt b/libdap-qt
index 96629d270..2cabc1d39 160000
--- a/libdap-qt
+++ b/libdap-qt
@@ -1 +1 @@
-Subproject commit 96629d270265f9b75c8c289b7b2ab45ce8f75df3
+Subproject commit 2cabc1d39de61771f043a5161e7891f22d2d81ae
--
GitLab