Fix logging API for GUI and add DC

In the brez GUI program there were lines missing sometimes. It also occured when switched to logging to a channel. It most likely had to do something with the string that was built. Now the log-to-channel is kept (seems more concurrent-safe).

Author: viduq

asdu.go

@@ -234,7 +234,7 @@ func (infoObj InfoObj) writeInfo(typeId TypeId, buf *bytes.Buffer) error {
 		binary.Write(buf, binary.LittleEndian, int16(val))
 		infoObj.writeQualitySeparateOctet(buf)
 
-	case C_SC_NA_1:
+	case C_SC_NA_1, C_DC_NA_1:
 		// command info, todo make configurable
 		infoObj.CommandInfo.Quoc = Quoc{
 			Select: false,

logging.go

@@ -6,96 +6,58 @@ import (
 )
 
 var (
-	logStrings []string
-	logDebug   *log.Logger
-	logError   *log.Logger
-	logInfo    *log.Logger
+	LogChan chan string
+
+	logDebug *log.Logger
+	logError *log.Logger
+	logInfo  *log.Logger
 
 	vv104loggerDebug vv104logger
 	vv104loggerError vv104logger
 	vv104loggerInfo  vv104logger
-	// e.g. for use with GUI: GUI can set its update function for the text box here
-	LogCallBack func()
 )
 
 type vv104logger struct {
-	logToBuffer bool
+	logToChan   bool
 	logToStdOut bool
-	logString   string
-}
-
-func addLogEntry(s string) {
-	logStrings = append(logStrings, s)
-}
-
-// API to read from logs (concurrently?)
-func ReadLogEntry() string {
-	var s string = ""
-	for _, logString := range logStrings {
-		s += logString
-		logStrings = logStrings[1:]
-
-	}
-	return s
 }
 
 func (vvlog vv104logger) Write(p []byte) (n int, err error) {
 
-	if vvlog.logToBuffer {
-		addLogEntry(string(p))
+	if vvlog.logToChan {
+		// addLogEntry(string(p))
+		LogChan <- string(p)
 	}
 
 	if vvlog.logToStdOut {
 		n, err = fmt.Print(string(p))
 	}
 
-	if LogCallBack != nil {
-		LogCallBack()
-	}
-
 	return n, err
 }
 
+func NewLogChan() chan string {
+	LogChan = make(chan string, 50)
+	return LogChan
+}
+
 func initLogger(config Config) {
 
 	vv104loggerDebug = vv104logger{
-		logToBuffer: config.LogToBuffer,
+		logToChan:   config.LogToBuffer,
 		logToStdOut: config.LogToStdOut,
 	}
 	vv104loggerError = vv104logger{
-		logToBuffer: config.LogToBuffer,
+		logToChan:   config.LogToBuffer,
 		logToStdOut: config.LogToStdOut,
 	}
 	vv104loggerInfo = vv104logger{
-		logToBuffer: config.LogToBuffer,
+		logToChan:   config.LogToBuffer,
 		logToStdOut: config.LogToStdOut,
 	}
 
-	// var output io.Writer
-	// // var multiOutput io.MultiWriter() todo?
-
-	// if config.LogToBuffer {
-	// 	output = &LogBuf
-	// } else {
-	// 	output = os.Stdout
-	// }
-
-	// logDebug = log.New(output, "🪲 ", log.Ltime|log.Lshortfile)
-	// logError = log.New(output, "❌ ", log.Ltime|log.Lshortfile)
-	// logInfo = log.New(output, "🥨 ", log.Ltime)
-
 	logDebug = log.New(vv104loggerDebug, "Debug: ", log.Ltime|log.Lshortfile)
 	logError = log.New(vv104loggerError, "ERROR: ", log.Ltime|log.Lshortfile)
 	logInfo = log.New(vv104loggerInfo, "", log.Ltime)
 
 }
-
-// func logInfof(v any) {
-// 	logDebug.Println(v)
-
-// 	// call callback function
-// 	LogCallBack()
-
-// }
-
-// str, err := InfoLogBuf.ReadString(0x0a) // 0x0a = newline