release 1.5.8

ZitiUpdateService/App.config

@@ -14,6 +14,7 @@
     <!--default to look for updates once every ten minutes-->
     <add key="Version" value="release"/>
     <add key="ClientSettingsProvider.ServiceUri" value=""/>
+    <add key="UseBetaReleases" value="false"/>
   </appSettings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>

service/cziti/windns.go

@@ -20,14 +20,14 @@ package cziti
 import (
 	"bytes"
 	"fmt"
-	"github.com/michaelquigley/pfxlog"
+	"github.com/openziti/desktop-edge-win/service/ziti-tunnel/util/logging"
 	"net"
 	"os"
 	"os/exec"
 	"strings"
 )
 
-var log = pfxlog.Logger()
+var log = logging.Logger()
 
 func ResetDNS() {
 	log.Info("resetting DNS server addresses")

service/go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
 	github.com/lestrrat-go/strftime v1.0.1 // indirect
-	github.com/michaelquigley/pfxlog v0.0.0-20190813191113-2be43bd0dccc
+	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
 	github.com/miekg/dns v1.1.29
 	github.com/openziti/foundation v0.14.17
 	github.com/openziti/sdk-golang v0.14.12

service/ziti-tunnel/util/detect-ip-changes.go

@@ -18,7 +18,7 @@
 package util
 
 import (
-	"github.com/michaelquigley/pfxlog"
+	"github.com/openziti/desktop-edge-win/service/ziti-tunnel/util/logging"
 	"syscall"
 	"unsafe"
 
@@ -32,7 +32,7 @@ var (
 	procWSACreateEvent   = modws2_32.NewProc("WSACreateEvent")
 	procNotifyAddrChange = modiphlpapi.NewProc("NotifyAddrChange")
 	procNotifyRouteChange = modiphlpapi.NewProc("NotifyRouteChange")
-    log = pfxlog.Logger()
+	log = logging.Logger()
 )
 
 func OnIPChange(callback func()) {

service/ziti-tunnel/util/logging/loghelper.go

@@ -18,34 +18,48 @@
 package logging
 
 import (
+	"fmt"
 	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
-	"github.com/michaelquigley/pfxlog"
-	"github.com/openziti/desktop-edge-win/service/cziti"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/windows/svc/debug"
 	"io"
 	"os"
 	"strings"
+	"syscall"
 	"time"
 
 	"github.com/openziti/desktop-edge-win/service/ziti-tunnel/config"
 )
 
 var Elog debug.Log
-var logger *logrus.Entry
+var logger = logrus.New()
+var loggerInitialized = false
+var tf = "2006-01-02-030405.999"
+var tfl = len(tf)
+
+
+func init() {
+	/*
+	 * https://github.com/sirupsen/logrus/issues/496
+	 */
+	handle := syscall.Handle(os.Stdout.Fd())
+	kernel32DLL := syscall.NewLazyDLL("kernel32.dll")
+	setConsoleModeProc := kernel32DLL.NewProc("SetConsoleMode")
+	setConsoleModeProc.Call(uintptr(handle), 0x0001|0x0002|0x0004)
 
-func Logger() *logrus.Entry {
-	if logger == nil {
-		logger = pfxlog.Logger()
+	f := &dateFormatter{
+		timeFormat: tf,
 	}
-	return logger
+	logger.SetFormatter(f)
 }
 
-var loggerInitialized = false
+func Logger() *logrus.Logger {
+	return logger
+}
 
 func InitLogger(level string) {
 	l, _ := ParseLevel(level)
-	logrus.SetLevel(l)
+	logger.SetLevel(l)
 
 	rl, _ := rotatelogs.New(config.LogFile() + ".%Y%m%d%H%M.log",
 		rotatelogs.WithRotationTime(24 * time.Hour),
@@ -55,7 +69,6 @@ func InitLogger(level string) {
 	multiWriter := io.MultiWriter(rl, os.Stdout)
 
 	logrus.SetOutput(multiWriter)
-	logrus.SetFormatter(pfxlog.NewFormatter())
 	if !loggerInitialized {
 		logger.Infof("============================================================================")
 		logger.Infof("Logger initialization")
@@ -66,12 +79,6 @@ func InitLogger(level string) {
 	}
 }
 
-func SetLogLevel(goLevel logrus.Level, cLevel int) {
-	logrus.Infof("Setting logger levels to %s", goLevel)
-	logrus.SetLevel(goLevel)
-	cziti.SetLogLevel(cLevel)
-}
-
 func ParseLevel(lvl string) (logrus.Level, int) {
 	switch strings.ToLower(lvl) {
 	case "panic":
@@ -94,4 +101,60 @@ func ParseLevel(lvl string) (logrus.Level, int) {
 		logrus.Warnf("level not recognized: [%s]. Using Info", lvl)
 		return logrus.InfoLevel, 3
 	}
-}
+}
+
+type dateFormatter struct {
+	timeFormat string
+}
+
+func (f *dateFormatter) Format(entry *logrus.Entry) ([]byte, error) {
+	var level string
+	switch entry.Level {
+	case logrus.PanicLevel:
+		level = panicColor
+	case logrus.FatalLevel:
+		level = fatalColor
+	case logrus.ErrorLevel:
+		level = errorColor
+	case logrus.WarnLevel:
+		level = warnColor
+	case logrus.InfoLevel:
+		level = infoColor
+	case logrus.DebugLevel:
+		level = debugColor
+	case logrus.TraceLevel:
+		level = traceColor
+	}
+
+	now := f.padDateWithZeros(time.Now().UTC())
+	return []byte(fmt.Sprintf("[%sz] %s\t%s\n",
+			now,
+			level,
+			entry.Message),
+		),
+		nil
+}
+
+var zeros = "000"
+func (f *dateFormatter) padDateWithZeros(t time.Time) string {
+	d := t.Format(f.timeFormat)
+	l := len(d)
+	if l == tfl {
+		return d
+	}
+
+	toPad := tfl - l
+	if toPad == 4 {
+		return d + ".000"
+	} else {
+		return d + zeros[:tfl-l]
+	}
+}
+
+var panicColor = ansi.Red + "PANIC" + ansi.DefaultFG
+var fatalColor = ansi.Red + "FATAL" + ansi.DefaultFG
+var errorColor = ansi.Red + "ERROR" + ansi.DefaultFG
+var warnColor = ansi.Yellow + " WARN" + ansi.DefaultFG
+var infoColor = ansi.White + " INFO" + ansi.DefaultFG
+var debugColor = ansi.Blue + "DEBUG" + ansi.DefaultFG
+var traceColor = ansi.LightBlack + "TRACE" + ansi.DefaultFG