From af453085b0e6491de515d536d64c76d27686a9eb Mon Sep 17 00:00:00 2001
From: Marko Mecina <marko.mecina@univie.ac.at>
Date: Mon, 3 May 2021 15:13:20 +0200
Subject: [PATCH] update configuration
---
.gitignore | 22 ++++++++++++++++++++++
Ccs/ccs_main_config.cfg | 2 +-
Tst/log_viewer/log_viewer.cfg | 2 +-
Tst/tst/tst.cfg | 2 +-
logs/.gitkeep | 0
5 files changed, 25 insertions(+), 3 deletions(-)
create mode 100644 logs/.gitkeep
diff --git a/.gitignore b/.gitignore
index 2521d2d..1412f3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,25 @@
+/Tst/log_viewer/Makefile
+/Tst/log_viewer/Makefile.in
+/Tst/log_viewer/aclocal.m4
+/Tst/log_viewer/autom4te.cache/
+/Tst/log_viewer/config.status
+/Tst/log_viewer/configure
+/Tst/log_viewer/install-sh
+/Tst/log_viewer/log_viewer.desktop
+/Tst/log_viewer/missing
+/Tst/tst/Makefile
+/Tst/tst/Makefile.in
+/Tst/tst/aclocal.m4
+/Tst/tst/autom4te.cache/
+/Tst/tst/config.status
+/Tst/tst/configure
+/Tst/tst/install-sh
+/Tst/tst/missing
+/Tst/tst/tst.desktop
+
### Example user template
+!.gitkeep
+
# IntelliJ project files
.idea
@@ -142,3 +163,4 @@ dmypy.json
# Cython debug symbols
cython_debug/
+/Tst/confignator/doc/source/_apidocfiles/
diff --git a/Ccs/ccs_main_config.cfg b/Ccs/ccs_main_config.cfg
index a03d9ce..522db3e 100644
--- a/Ccs/ccs_main_config.cfg
+++ b/Ccs/ccs_main_config.cfg
@@ -12,7 +12,7 @@ font_size = 10
scrollback_lines = 1000
[ccs-logging]
-log-dir = ${paths:obsw}/logs
+log-dir = ${paths:base}/logs
level = INFO
max_logs = 30
diff --git a/Tst/log_viewer/log_viewer.cfg b/Tst/log_viewer/log_viewer.cfg
index 0347de8..97b978c 100644
--- a/Tst/log_viewer/log_viewer.cfg
+++ b/Tst/log_viewer/log_viewer.cfg
@@ -27,5 +27,5 @@ thread = False
threadname = False
[log-viewer-history]
-last-folder = /home/swiii/OBSW/implementation/logs/tst/data_model
+last-folder = ${logging:log-dir}/tst/data_model
diff --git a/Tst/tst/tst.cfg b/Tst/tst/tst.cfg
index 64e00ce..f8f1ef4 100644
--- a/Tst/tst/tst.cfg
+++ b/Tst/tst/tst.cfg
@@ -18,5 +18,5 @@ paned-position = 960
paned-position-codeblockreuse = 520
[tst-history]
-last-folder = /home/swiii/OBSW/implementation/Tst/test_specs
+last-folder = ${paths:tst}/test_specs
diff --git a/logs/.gitkeep b/logs/.gitkeep
new file mode 100644
index 0000000..e69de29
--
GitLab