Fixes needed form original fork

.vscode/launch.json

@@ -0,0 +1,22 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "ConsoleLogWriter_Manual",
+            "type": "go",
+            "request": "launch",
+            "mode": "debug",
+            "program": "${workspaceRoot}/examples/ConsoleLogWriter_Manual/ConsoleLogWriter_Manual.go",
+        },
+        {
+            "name": "FileLogWriter_Manual",
+            "type": "go",
+            "request": "launch",
+            "mode": "debug",
+            "program": "${workspaceRoot}/examples/FileLogWriter_Manual/FileLogWriter_Manual.go",
+        },
+    ]
+}

examples/ConsoleLogWriter_Manual.go → examples/ConsoleLogWriter_Manual/ConsoleLogWriter_Manual.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	"time"
-)
 
-import l4g "code.google.com/p/log4go"
+	l4g "github.com/wvkehoe/log4go"
+)
 
 func main() {
 	log := l4g.NewLogger()

examples/FileLogWriter_Manual.go → examples/FileLogWriter_Manual/FileLogWriter_Manual.go

@@ -6,9 +6,9 @@ import (
 	"io"
 	"os"
 	"time"
-)
 
-import l4g "code.google.com/p/log4go"
+	l4g "github.com/wvkehoe/log4go"
+)
 
 const (
 	filename = "flw.log"
@@ -19,17 +19,17 @@ func main() {
 	log := l4g.NewLogger()
 
 	// Create a default logger that is logging messages of FINE or higher
-	log.AddFilter("file", l4g.FINE, l4g.NewFileLogWriter(filename, false))
+	log.AddFilter("file", l4g.FINE, l4g.NewFileLogWriter(filename, false, false))
 	log.Close()
 
 	/* Can also specify manually via the following: (these are the defaults) */
-	flw := l4g.NewFileLogWriter(filename, false)
-	flw.SetFormat("[%D %T] [%L] (%S) %M")
+	flw := l4g.NewFileLogWriter(filename, false, false)
+	flw.SetFormat("[%D %T] [%L] (%C) (%S) %M")
 	flw.SetRotate(false)
 	flw.SetRotateSize(0)
 	flw.SetRotateLines(0)
 	flw.SetRotateDaily(false)
-	log.AddFilter("file", l4g.FINE, flw)
+	log.AddFilter("file", l4g.FINE, flw, "com.foobar")
 
 	// Log some experimental messages
 	log.Finest("Everything is created now (notice that I will not be printing to the file)")

examples/JsonCfgTest.go → examples/JsonCfgTest/JsonCfgTest.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	log "github.com/jeanphorn/log4go"
+	log "github.com/wvkehoe/log4go"
 )
 
 func main() {

examples/LogInjectionExample.go → examples/LogInjectionExample/LogInjectionExample.go

@@ -6,9 +6,9 @@ import (
 	"io"
 	"os"
 	"time"
-)
 
-import l4g "log4go"
+	l4g "github.com/wvkehoe/log4go"
+)
 
 const (
 	filename = "loginjection.log"
@@ -39,7 +39,7 @@ func main() {
 	log.AddFilter("file", l4g.FINE, flw)
 
 	// Log some experimental messages
-	for _,message := range(user_input) {
+	for _, message := range user_input {
 		log.Info(message)
 	}
 
@@ -51,7 +51,7 @@ func main() {
 	// Close the log
 	log.Close()
 
-	// Print what was logged to the file 
+	// Print what was logged to the file
 	fd, err := os.Open(filename)
 	if err != nil {
 		fmt.Printf("Error reopening file: %s", filename)

examples/SocketLogWriter_Manual.go → examples/SimpleNetLogServer_Manual/SocketLogWriter_Manual.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	"time"
-)
 
-import l4g "code.google.com/p/log4go"
+	l4g "github.com/wvkehoe/log4go"
+)
 
 func main() {
 	log := l4g.NewLogger()

examples/XMLConfigurationExample.go → examples/XMLConfigurationExample/XMLConfigurationExample.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	l4g "github.com/jeanphorn/log4go"
+	l4g "github.com/wvkehoe/log4go"
 )
 
 func main() {

examples/example.xml

@@ -1,3 +1,4 @@
+
 <logging>
   <filter enabled="true">
     <tag>stdout</tag>

filelog.go

@@ -5,8 +5,8 @@ package log4go
 import (
 	"fmt"
 	"os"
-	"time"
 	"strings"
+	"time"
 )
 
 // This log writer sends output to a file
@@ -41,7 +41,7 @@ type FileLogWriter struct {
 	maxbackup int
 
 	// Sanitize newlines to prevent log injection
-	sanitize	bool
+	sanitize bool
 }
 
 // This is the FileLogWriter's output method
@@ -52,6 +52,7 @@ func (w *FileLogWriter) LogWrite(rec *LogRecord) {
 func (w *FileLogWriter) Close() {
 	close(w.rec)
 	w.file.Sync()
+	w.file.Close()
 }
 
 // NewFileLogWriter creates a new LogWriter which writes to the given file and
@@ -169,7 +170,7 @@ func (w *FileLogWriter) intRotate() error {
 				// Rename the file to its newfound home
 				err = os.Rename(w.filename, fname)
 				if err != nil {
-					return fmt.Errorf("Rotate: %s\n", err)
+					return fmt.Errorf("Rotate: %s", err)
 				}
 			} else if !w.daily {
 				num = w.maxbackup - 1
@@ -186,7 +187,7 @@ func (w *FileLogWriter) intRotate() error {
 				err = os.Rename(w.filename, fname)
 				// return error if the last file checked still existed
 				if err != nil {
-					return fmt.Errorf("Rotate: %s\n", err)
+					return fmt.Errorf("Rotate: %s", err)
 				}
 			}
 

go.mod

@@ -0,0 +1,5 @@
+module github.com/wvkehoe/log4go
+
+go 1.18
+
+require github.com/toolkits/file v0.0.0-20160325033739-a5b3c5147e07

go.sum

@@ -0,0 +1,2 @@
+github.com/toolkits/file v0.0.0-20160325033739-a5b3c5147e07 h1:d/VUIMNTk65Xz69htmRPNfjypq2uNRqVsymcXQu6kKk=
+github.com/toolkits/file v0.0.0-20160325033739-a5b3c5147e07/go.mod h1:FbXpUxsx5in7z/OrWFDdhYetOy3/VGIJsVHN9G7RUPA=

jsonconfig.go

@@ -76,7 +76,7 @@ func (log Logger) LoadJsonConfiguration(filename string) {
 			os.Exit(1)
 		}
 	} else {
-		content = string(dst.Bytes())
+		content = dst.String()
 	}
 
 	err = json.Unmarshal([]byte(content), &lc)

log4go.go

@@ -216,19 +216,21 @@ func (log Logger) intLogf(lvl Level, format string, args ...interface{}) {
 		msg = fmt.Sprintf(format, args...)
 	}
 
-	// Make the log record
-	rec := &LogRecord{
-		Level:   lvl,
-		Created: time.Now(),
-		Source:  src,
-		Message: msg,
-	}
+	now := time.Now()
 
 	// Dispatch the logs
 	for _, filt := range log {
 		if lvl < filt.Level {
 			continue
 		}
+		// Make the log record
+		rec := &LogRecord{
+			Level:    lvl,
+			Created:  now,
+			Source:   src,
+			Message:  msg,
+			Category: filt.Category,
+		}
 		filt.LogWrite(rec)
 	}
 }
@@ -254,20 +256,21 @@ func (log Logger) intLogc(lvl Level, closure func() string) {
 	if ok {
 		src = fmt.Sprintf("%s:%d", runtime.FuncForPC(pc).Name(), lineno)
 	}
-
-	// Make the log record
-	rec := &LogRecord{
-		Level:   lvl,
-		Created: time.Now(),
-		Source:  src,
-		Message: closure(),
-	}
+	now := time.Now()
 
 	// Dispatch the logs
 	for _, filt := range log {
 		if lvl < filt.Level {
 			continue
 		}
+		// Make the log record
+		rec := &LogRecord{
+			Level:    lvl,
+			Created:  now,
+			Source:   src,
+			Category: filt.Category,
+			Message:  closure(),
+		}
 		filt.LogWrite(rec)
 	}
 }
@@ -287,19 +290,21 @@ func (log Logger) Log(lvl Level, source, message string) {
 		return
 	}
 
-	// Make the log record
-	rec := &LogRecord{
-		Level:   lvl,
-		Created: time.Now(),
-		Source:  source,
-		Message: message,
-	}
+	now := time.Now()
 
 	// Dispatch the logs
 	for _, filt := range log {
 		if lvl < filt.Level {
 			continue
 		}
+		// Make the log record
+		rec := &LogRecord{
+			Level:    lvl,
+			Created:  now,
+			Source:   source,
+			Message:  message,
+			Category: filt.Category,
+		}
 		filt.LogWrite(rec)
 	}
 }