log: deeper trace

Author: ignoramous

intra/ipn/warp/yegor.go

@@ -1362,9 +1362,14 @@ func (w *BaseClient) MakeWsWgFrom(entitlementOrWsConfigJson []byte) (*WsClient,
 
 	var existingConf WsWgConfig
 	err := json.Unmarshal(entitlementOrWsConfigJson, &existingConf)
-	if err != nil {
+
+	sz := len(entitlementOrWsConfigJson)
+	hasEnt := existingConf.Entitlement == nil
+	hasTok := hasEnt && len(existingConf.Entitlement.SessionToken) <= 0
+	if err != nil || !hasEnt || !hasTok {
 		// may be this is an entitlement?
-		log.W("ws: make: unmarshal config err: %v; retry as entitlement", err)
+		log.W("ws: make: unmarshal config (sz %d / hasEnt %t / hasTok %t) err? %v; retry as entitlement",
+			sz, hasEnt, hasTok, err)
 		return w.MakeWsWg(entitlementOrWsConfigJson)
 	}
 

intra/log/logger.go

@@ -559,16 +559,19 @@ func (l *simpleLogger) writelog(lvl LogLevel, at int, msg string, args ...any) {
 	if ll || cc {
 		switch lvl {
 		case ERROR:
-			_, x := caller1(at+nextframe+3, ">>")
+			_, x := caller1(at+nextframe+4, ">")
 			trace += x
 			fallthrough
 		case WARN:
-			_, y := caller1(at+nextframe+2, ">>")
+			_, y := caller1(at+nextframe+3, ">")
 			trace += y
 			fallthrough
 		case INFO:
-			_, z := caller1(at+nextframe+1, ">>")
+			_, z := caller1(at+nextframe+2, ">")
 			trace += z
+		case DEBUG:
+			_, w := caller1(at+nextframe+1, ">")
+			trace += w
 		}
 		msg = l.msgstr(lvl, trace+file1+msg, args...)
 		if ll {