Skip to content

Commit 42afa01

Browse files
authored
Merge pull request #87 from sy-c/master
v2.5.3
2 parents 289f931 + f1d1805 commit 42afa01

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ endif()
6565
include(ExternalProject)
6666
externalproject_add (Common-standalone
6767
GIT_REPOSITORY "https://github.com/AliceO2Group/Common.git"
68-
GIT_TAG "v1.5.2"
68+
GIT_TAG "v1.6.1"
6969
LOG_DOWNLOAD 1
7070
UPDATE_COMMAND ""
7171
PATCH_COMMAND ""

doc/releaseNotes.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,6 @@ This file describes the main feature changes for each InfoLogger released versio
132132

133133
## v2.5.2 - 03/10/2022
134134
- added optional parameter to InfoLogger::filterDiscardSetFile(), to ignore debug messages when set.
135+
136+
## v2.5.3 - 24/10/2022
137+
- Common/SimpleLog update: fiterDiscardSetFile / rotateMaxFiles parameter: If one, a single file is created and cleared immediately, and messages are discarded after reaching rotateMaxBytes.

include/InfoLogger/InfoLogger.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ class InfoLogger
379379
/// Defines a file where discarded messages are saved
380380
/// path: path to file. If null, discarding to file is disabled.
381381
/// rotateMaxBytes: Maximum file size, after which a new file is created. If zero, no limit.
382-
/// rotateMaxFiles: Maximum number of files to keep (including the "current" file). If zero, no limit.
382+
/// rotateMaxFiles: Maximum number of files to keep (including the "current" file). If zero, no limit. If one, a single file is created and cleared immediately, and messages are discarded after reaching rotateMaxBytes.
383383
/// rotateNow: If non-zero, the file is immediately rotated (independently of its size), otherwise it is appended.
384384
/// ignoreDebug: do not store debug messages in the file if set to true.
385385
/// Returns 0 on success, or an error code.

src/infoBrowser.tcl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ font create filterfont -family Arial -size 9 -weight bold
194194
font create timefont -family Arial -size 9 -weight bold
195195
font create buttonfont -family Arial -size 9 -weight bold
196196
font create titlefont -family Arial -size 10 -weight bold
197+
font create messagesfont -family monospace -size 9
197198

198199
##############################
199200
# menu
@@ -949,7 +950,7 @@ proc show_messages {} {
949950
global log_fields
950951
global log_visible_fields
951952
global log_fields_def_size
952-
953+
global messagesfont
953954
if {[winfo exists .messages.pw]} {destroy .messages.pw}
954955

955956
global version_ok
@@ -966,7 +967,7 @@ proc show_messages {} {
966967
foreach item $log_visible_fields {
967968
frame .messages.pw.frame_$item
968969
label .messages.pw.frame_$item.label -text "$item"
969-
listbox .messages.pw.frame_$item.listbox -listvariable log_val_$item -yscrollcommand ".messages.sb set" -xscrollcommand ".messages.pw.frame_$item.scroll set" -selectmode extended -selectbackground yellow -selectforeground black -exportselection no
970+
listbox .messages.pw.frame_$item.listbox -listvariable log_val_$item -yscrollcommand ".messages.sb set" -xscrollcommand ".messages.pw.frame_$item.scroll set" -selectmode extended -selectbackground yellow -selectforeground black -exportselection no -font messagesfont
970971
scrollbar .messages.pw.frame_$item.scroll -orient horizontal -command ".messages.pw.frame_$item.listbox xview" -width 10
971972

972973
set pwidth "[expr 8*[lindex $log_fields_def_size [lsearch $log_fields $item]]]"

0 commit comments

Comments
 (0)