Skip to content
Snippets Groups Projects
Commit 7965b807 authored by Evgenii Tagiltsev's avatar Evgenii Tagiltsev
Browse files

Merge branch 'master' into features-2607

parents 150371a4 0c9a4aad
No related branches found
No related tags found
1 merge request!38Features 2607
......@@ -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
......
......@@ -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\\\"
......
......@@ -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
......
Subproject commit 801174784d3bf0a500c98de6f554ddac6b0d99d2
Subproject commit 2cabc1d39de61771f043a5161e7891f22d2d81ae
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment