gsadmin/desktop-edge-win
1
0
Fork 0
mirror of https://github.com/openziti/desktop-edge-win.git synced 2026-10-13 16:21:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #258 from openziti/logging-update

Browse Source 
updates to logging in case we want file name/line number later on
This commit is contained in:
dovholuknf
2020-12-01 17:20:25 -05:00
committed by GitHub
parent 4849486efd 5f5bba493e
commit 5412445c2d
8 changed files with 106 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
service/cziti/sdk.c
+4
View File
@@ -84,3 +84,7 @@ extern void c_mapiter(model_map *map) {
void ZLOG(int level, char* msg) {
ZITI_LOG(level, "%s", msg);
}
bool is_null(void* anything){
return anything == NULL;
}
service/cziti/sdk.go
+11 -7
View File
@@ -109,6 +109,10 @@ func (c *ZIdentity) GetMetrics() (int64, int64, bool) {
if c == nil {
return 0, 0, false
}
if C.is_null(unsafe.Pointer(&c.zctx)) {
log.Warnf("ziti context is C.NULL! %s", c.Fingerprint)
return 0, 0, false
}
var up, down C.double
C.ziti_get_transfer_rates(c.zctx, &up, &down)
@@ -371,28 +375,28 @@ func log_writer_cb(level C.int, loc C.string, msg C.string, _ /*msglen*/ C.size_
lvl := level
switch lvl {
case 0:
log.Warnf("level 0 should not be logged, please report: %s", gomsg)
noFileLog.Warnf("level 0 should not be logged, please report: %s", gomsg)
break
case 1:
log.Errorf("SDK: %s\t%s", goline, gomsg)
noFileLog.Errorf("SDK: %s\t%s", goline, gomsg)
break
case 2:
log.Warnf("SDK: %s\t%s", goline, gomsg)
noFileLog.Warnf("SDK: %s\t%s", goline, gomsg)
break
case 3:
log.Infof("SDK: %s\t%s", goline, gomsg)
noFileLog.Infof("SDK: %s\t%s", goline, gomsg)
break
case 4:
log.Debugf("SDK: %s\t%s", goline, gomsg)
noFileLog.Debugf("SDK: %s\t%s", goline, gomsg)
break
case 5:
case 6:
//VERBOSE:5
//TRACE:6
log.Tracef("SDK: %s\t%s", goline, gomsg)
noFileLog.Tracef("SDK: %s\t%s", goline, gomsg)
break
default:
log.Warnf("level [%d] NOT recognized: %s", level, gomsg)
noFileLog.Warnf("level [%d] NOT recognized: %s", level, gomsg)
break
}
}
service/cziti/sdk.h
+1 -1
View File
@@ -57,5 +57,5 @@ extern void ziti_pq_mac_go(ziti_context ztx, char *id, ziti_pr_mac_cb response_c
extern void log_writer_shim_go(int level, const char *loc, const char *msg, size_t msglen);
void log_writer_cb(int level, char *loc, char *msg, size_t msglen);
bool is_null(void* anything);
#endif /* GOLANG_SDK_H */
service/cziti/windns.go
+1
View File
@@ -28,6 +28,7 @@ import (
)
var log = logging.Logger()
var noFileLog = logging.NoFilenameLogger()
func ResetDNS() {
log.Info("resetting DNS server addresses")
service/ziti-tunnel/main.go
+3 -1
View File
@@ -22,6 +22,7 @@ import (
"fmt"
"github.com/openziti/desktop-edge-win/service/ziti-tunnel/dto"
"github.com/openziti/desktop-edge-win/service/ziti-tunnel/util/logging"
"github.com/sirupsen/logrus"
"golang.org/x/sys/windows/svc/debug"
"golang.org/x/sys/windows/svc/eventlog"
"os"
@@ -39,7 +40,8 @@ func main() {
Revision: Revision,
BuildDate: BuildDate,
}
logging.InitLogger("info")
logging.InitLogger(logrus.InfoLevel)
// passing no arguments is an indicator that this is expecting to be run 'as a service'.
// using arg count instead of svc.IsAnInteractiveSession() as svc.IsAnInteractiveSession()
service/ziti-tunnel/service/ipc.go
+1 -1
View File
@@ -67,7 +67,7 @@ func SubMain(ops chan string, changes chan<- svc.Status) error {
parsedLevel, cLogLevel := logging.ParseLevel(l)
rts.state.LogLevel = parsedLevel.String()
logging.InitLogger(l)
logging.InitLogger(parsedLevel)
_ = logging.Elog.Info(InformationEvent, SvcName+" starting. log file located at "+config.LogFile())
service/ziti-tunnel/service/state.go
+5 -3
View File
@@ -219,7 +219,6 @@ func (t *RuntimeState) CreateTun(ipv4 string, ipv4mask int) (net.IP, *tun.Device
}
func (t *RuntimeState) LoadIdentity(id *Id) {
log.Infof("loading identity %s[%s]", id.Name, id.FingerPrint)
if id.CId != nil && id.CId.Loaded {
log.Warnf("id %s[%s] already connected", id.Name, id.FingerPrint)
return
@@ -231,11 +230,14 @@ func (t *RuntimeState) LoadIdentity(id *Id) {
return
}
log.Infof("loading identity %s[%s]", id.Name, id.FingerPrint)
now := time.Now()
id.CId = cziti.LoadZiti(id.Path(), id.Active)
if id.CId == nil {
/*if id.CId == nil {
log.Warnf("connecting to identity with fingerprint [%s] did not error but no context was returned", id.FingerPrint)
return
}
}*/
log.Infof("loading identity for %s[%s] completed taking %f seconds", id.Name, id.FingerPrint, time.Now().Sub(now).Seconds())
id.ControllerVersion = id.CId.Version
id.CId.Fingerprint = id.FingerPrint
service/ziti-tunnel/util/logging/loghelper.go
+80 -21
View File
@@ -33,11 +33,11 @@ import (
)
var Elog debug.Log
var logger = logrus.New()
var withFilenameLogger = logrus.New()
var noFilenamelogger = logrus.New()
var loggerInitialized = false
var tf = "2006-01-02T15:04:05.000"
var tfl = len(tf)
var baseImportPath = "github.com/openziti/desktop-edge-win/service/"
var baseFilePath = config.ExecutablePath()
func init() {
/*
@@ -48,19 +48,36 @@ func init() {
setConsoleModeProc := kernel32DLL.NewProc("SetConsoleMode")
setConsoleModeProc.Call(uintptr(handle), 0x0001|0x0002|0x0004)
f := &dateFormatter{
timeFormat: tf,
with := &dateFormatterNoFilename{
}
logger.SetFormatter(f)
/*with := &dateFormatterWithFilename{
}*/
with.dateFormatter.timeFormat = UTCFormat()
withFilenameLogger.SetFormatter(with)
without := &dateFormatterNoFilename{
}
without.dateFormatter.timeFormat = UTCFormat()
noFilenamelogger.SetFormatter(without)
}
func Logger() *logrus.Logger {
return logger
return withFilenameLogger
}
func InitLogger(level string) {
l, _ := ParseLevel(level)
logger.SetLevel(l)
func NoFilenameLogger() *logrus.Logger {
return noFilenamelogger
}
func InitLogger(level logrus.Level) {
initLogger(withFilenameLogger, level)
initLogger(noFilenamelogger, level)
}
func initLogger(logger *logrus.Logger, level logrus.Level) {
logger.SetLevel(level)
logger.SetReportCaller(true)
rl, _ := rotatelogs.New(config.LogFile() + ".%Y%m%d%H%M.log",
rotatelogs.WithRotationTime(24 * time.Hour),
@@ -99,7 +116,7 @@ func ParseLevel(lvl string) (logrus.Level, int) {
case "verbose":
return logrus.TraceLevel, 6
default:
logger.Warnf("level not recognized: [%s]. Using Info", lvl)
noFilenamelogger.Warnf("level not recognized: [%s]. Using Info", lvl)
return logrus.InfoLevel, 3
}
}
@@ -107,25 +124,67 @@ func ParseLevel(lvl string) (logrus.Level, int) {
type dateFormatter struct {
timeFormat string
}
type dateFormatterWithFunction struct {
dateFormatter
}
type dateFormatterWithFilename struct {
dateFormatter
}
type dateFormatterNoFilename struct {
dateFormatter
}
func (f *dateFormatter) Format(entry *logrus.Entry) ([]byte, error) {
var level string
func UTCFormat() string {
return "2006-01-02T15:04:05.000"
}
func toLevel(entry *logrus.Entry) string {
switch entry.Level {
case logrus.PanicLevel:
level = panicColor
return panicColor
case logrus.FatalLevel:
level = fatalColor
return fatalColor
case logrus.ErrorLevel:
level = errorColor
return errorColor
case logrus.WarnLevel:
level = warnColor
return warnColor
case logrus.InfoLevel:
level = infoColor
return infoColor
case logrus.DebugLevel:
level = debugColor
return debugColor
case logrus.TraceLevel:
level = traceColor
return traceColor
default:
return infoColor
}
}
func (f *dateFormatterWithFunction) Format(entry *logrus.Entry) ([]byte, error) {
level := toLevel(entry)
return []byte(fmt.Sprintf("[%sZ] %s\t%s:%d\t%s\n",
time.Now().UTC().Format(f.timeFormat),
level,
strings.ReplaceAll(entry.Caller.Function, baseImportPath, ""),
entry.Caller.Line,
entry.Message),
),
nil
}
func (f *dateFormatterWithFilename) Format(entry *logrus.Entry) ([]byte, error) {
level := toLevel(entry)
return []byte(fmt.Sprintf("[%sZ] %s\t%s:%d\t%s\n",
time.Now().UTC().Format(f.timeFormat),
level,
strings.ReplaceAll(entry.Caller.File, baseFilePath, ""),
entry.Caller.Line,
entry.Message),
),
nil
}
func (f *dateFormatterNoFilename) Format(entry *logrus.Entry) ([]byte, error) {
level := toLevel(entry)
return []byte(fmt.Sprintf("[%sZ] %s\t%s\n",
time.Now().UTC().Format(f.timeFormat),