From c8a6ddf36588fb0c4d83347f0fd7579d593e0903 Mon Sep 17 00:00:00 2001
From: dovholuknf <46322585+dovholuknf@users.noreply.github.com>
Date: Sun, 29 Nov 2020 11:49:25 -0500
Subject: [PATCH] logging fixes

---
 service/cziti/sdk.go                 | 2 +-
 service/ziti-tunnel/config/config.go | 2 +-
 service/ziti-tunnel/service/ipc.go   | 2 +-
 service/ziti-tunnel/service/state.go | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/service/cziti/sdk.go b/service/cziti/sdk.go
index e562111a..ad94b9e0 100644
--- a/service/cziti/sdk.go
+++ b/service/cziti/sdk.go
@@ -396,7 +396,7 @@ func log_writer_cb(level C.int, _ /*loc*/ C.string, msg C.string, _ /*msglen*/ C
 		log.Trace(gomsg)
 		break
 	default:
-		log.Warnf("level [%s] NOT recognized:", level, gomsg)
+		log.Warnf("level [%d] NOT recognized: %s", level, gomsg)
 		break
 	}
 }
\ No newline at end of file
diff --git a/service/ziti-tunnel/config/config.go b/service/ziti-tunnel/config/config.go
index 617fc518..f9da244c 100644
--- a/service/ziti-tunnel/config/config.go
+++ b/service/ziti-tunnel/config/config.go
@@ -26,7 +26,7 @@ import (
 func ExecutablePath() string {
 	fi, err := os.Executable()
 	if err != nil {
-		log.Panic("COULD NOT STAT os.executable! %v", err)
+		log.Panicf("COULD NOT STAT os.executable! %v", err)
 	}
 	dir := filepath.Dir(fi)
 	return dir
diff --git a/service/ziti-tunnel/service/ipc.go b/service/ziti-tunnel/service/ipc.go
index 65178bdf..59ab911f 100644
--- a/service/ziti-tunnel/service/ipc.go
+++ b/service/ziti-tunnel/service/ipc.go
@@ -818,7 +818,7 @@ func removeIdentity(out *json.Encoder, fingerprint string) {
 	err := disconnectIdentity(id)
 	if err != nil {
 		anyErrs = err.Error()
-		log.Errorf("error when disconnecting identity: %s, %v", id, err)
+		log.Errorf("error when disconnecting identity: %s, %v", fingerprint, err)
 	}
 
 	rts.RemoveByFingerprint(fingerprint)
diff --git a/service/ziti-tunnel/service/state.go b/service/ziti-tunnel/service/state.go
index df306d2f..88b3de89 100644
--- a/service/ziti-tunnel/service/state.go
+++ b/service/ziti-tunnel/service/state.go
@@ -178,7 +178,7 @@ func (t *RuntimeState) CreateTun(ipv4 string, ipv4mask int) (net.IP, error) {
 		rts.UpdateIpv4(ipv4)
 	}
 	if ipv4mask < constants.Ipv4MaxMask {
-		log.Warnf("provided mask is too large: %d using default.", ipv4mask, constants.Ipv4DefaultMask)
+		log.Warnf("provided mask is too large: %d using default: %d", ipv4mask, constants.Ipv4DefaultMask)
 		ipv4mask = constants.Ipv4DefaultMask
 		rts.UpdateIpv4Mask(ipv4mask)
 	}
@@ -330,7 +330,7 @@ func (t *RuntimeState) scanForOrphanedIdentities(folder string) {
 func probeIdentityFile(path string, cfg *idcfg.Config) error {
 	file, err := os.OpenFile(path, os.O_RDONLY, 0644)
 	if err != nil {
-		log.Error("unexpected error opening config file: %v", err)
+		log.Errorf("unexpected error opening config file: %v", err)
 	}
 
 	r := bufio.NewReader(file)