You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2022/08/02 10:54:33 UTC
[plc4x] 01/02: fix(plc4xbrowser): fixed log setup
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit b75b22991e7508d0fd9511b0121b4f472ec59a0e
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Tue Aug 2 12:53:59 2022 +0200
fix(plc4xbrowser): fixed log setup
---
plc4go/tools/plc4xbrowser/main.go | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/plc4go/tools/plc4xbrowser/main.go b/plc4go/tools/plc4xbrowser/main.go
index 49d217958..a2e919ebd 100644
--- a/plc4go/tools/plc4xbrowser/main.go
+++ b/plc4go/tools/plc4xbrowser/main.go
@@ -58,6 +58,8 @@ var commandsExecuted int
var messagesReceived int
var messageOutput io.Writer
+var consoleOutput io.Writer
+
func init() {
hasShutdown = false
connections = make(map[string]plc4go.PlcConnection)
@@ -65,6 +67,21 @@ func init() {
func initSubsystem() {
driverManager = plc4go.NewPlcDriverManager()
+
+ logLevel := zerolog.InfoLevel
+ if configuredLevel := config.LogLevel; configuredLevel != "" {
+ if parsedLevel, err := zerolog.ParseLevel(configuredLevel); err != nil {
+ panic(err)
+ } else {
+ logLevel = parsedLevel
+ }
+ }
+
+ log.Logger = log.
+ //// Enable below if you want to see the filenames
+ //With().Caller().Logger().
+ Output(zerolog.ConsoleWriter{Out: tview.ANSIWriter(consoleOutput)}).
+ Level(logLevel)
}
var shutdownMutex sync.Mutex
@@ -426,26 +443,10 @@ func buildOutputArea(newPrimitive func(text string) tview.Primitive, application
{
consoleView := tview.NewTextView().
SetDynamicColors(true).
- SetRegions(true).
- SetWordWrap(true).
SetChangedFunc(func() {
application.Draw()
})
-
- logLevel := zerolog.InfoLevel
- if configuredLevel := config.LogLevel; configuredLevel != "" {
- if parsedLevel, err := zerolog.ParseLevel(configuredLevel); err != nil {
- panic(err)
- } else {
- logLevel = parsedLevel
- }
- }
-
- log.Logger = log.
- //// Enable below if you want to see the filenames
- //With().Caller().Logger().
- Output(zerolog.ConsoleWriter{Out: tview.ANSIWriter(consoleView)}).
- Level(logLevel)
+ consoleOutput = consoleView
consoleView.SetBorder(false)
outputArea.AddItem(consoleView, 2, 0, 1, 1, 0, 0, false)