Skip to content

Commit 8d1a7de

Browse files
moved some Debug msgs to Trace
1 parent dcb1157 commit 8d1a7de

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

daemon/main.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ func worker(id int) {
277277
default:
278278
pkt, ok := <-wrkChan
279279
if !ok {
280-
log.Debug("worker channel closed %d", id)
280+
log.Trace("worker channel closed %d", id)
281281
goto Exit
282282
}
283283
onPacket(pkt)
@@ -346,21 +346,21 @@ func initSystemdResolvedMonitor() {
346346
continue
347347
}
348348
/*for i, q := range response.Question {
349-
log.Debug("%d SYSTEMD RESPONSE Q: %s", i, q.Name)
349+
log.Trace("[DNS] %d systemd response, question: %s", i, q.Name)
350350
}*/
351351
for i, a := range response.Answer {
352352
if a.RR.Key.Type != systemd.DNSTypeA &&
353353
a.RR.Key.Type != systemd.DNSTypeAAAA &&
354354
a.RR.Key.Type != systemd.DNSTypeCNAME {
355-
log.Debug("systemd-resolved, excluding answer: %#v", a)
355+
log.Trace("systemd-resolved, excluding answer: %#v", a)
356356
continue
357357
}
358-
ip = net.IP(a.RR.Address)
359-
log.Debug("%d systemd-resolved monitor response: %s -> %s", i, a.RR.Key.Name, ip)
360358
if a.RR.Key.Type == systemd.DNSTypeCNAME {
361359
log.Debug("systemd-resolved CNAME >> %s -> %s", a.RR.Name, a.RR.Key.Name)
362360
dns.Track(a.RR.Name, a.RR.Key.Name /*domain*/)
363361
} else {
362+
ip = net.IP(a.RR.Address)
363+
log.Debug("%d systemd-resolved monitor response: %s -> %s", i, a.RR.Key.Name, ip)
364364
dns.Track(ip.String(), a.RR.Key.Name /*domain*/)
365365
}
366366
}

daemon/procmon/cache_events.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ func (e *EventsStore) Add(proc *Process) {
9191
e.UpdateItem(proc)
9292
}
9393
}
94-
log.Debug("[cache] EventsStore.Add() finished %s, %s", proc.Path, proc.Tree)
94+
log.Debug("[cache] EventsStore.Add() finished %d, %s, %s", proc.ID, proc.Path, proc.Tree)
9595
}
9696

9797
// UpdateItem updates a cache item
9898
func (e *EventsStore) UpdateItem(proc *Process) {
99-
log.Debug("[cache] updateItem() updating events store (total: %d), pid: %d, path: %s, %v", e.Len(), proc.ID, proc.Path, proc.Tree)
99+
log.Trace("[cache] updateItem() updating events store (total: %d), pid: %d, path: %s, %v", e.Len(), proc.ID, proc.Path, proc.Tree)
100100
if proc.Path == "" {
101101
return
102102
}
@@ -111,7 +111,7 @@ func (e *EventsStore) UpdateItem(proc *Process) {
111111

112112
// ReplaceItem replaces an existing process with a new one.
113113
func (e *EventsStore) ReplaceItem(oldProc, newProc *Process) {
114-
log.Debug("[event inCache, replacement] new: %d, %s -> inCache: %d -> %s - Trees: %s, %s", newProc.ID, newProc.Path, oldProc.ID, oldProc.Path, oldProc.Tree, newProc.Tree)
114+
log.Trace("[event inCache, replacement] new: %d, %s -> inCache: %d -> %s - Trees: %s, %s", newProc.ID, newProc.Path, oldProc.ID, oldProc.Path, oldProc.Tree, newProc.Tree)
115115
// Note: in rare occasions, the process being replaced is the older one.
116116
// if oldProc.Starttime > newProc.Starttime {}
117117
//
@@ -165,11 +165,11 @@ func (e *EventsStore) Update(oldProc, proc *Process) {
165165
}
166166

167167
if updateOld {
168-
log.Debug("[cache] Update end, updating oldProc: %d, %s, %v", oldProc.ID, oldProc.Path, oldProc.Tree)
168+
log.Trace("[cache] Update end, updating oldProc: %d, %s, %v", oldProc.ID, oldProc.Path, oldProc.Tree)
169169
e.UpdateItem(oldProc)
170170
}
171171
if update {
172-
log.Debug("[cache] Update end, updating newProc: %d, %s, %v", proc.ID, proc.Path, proc.Tree)
172+
log.Trace("[cache] Update end, updating newProc: %d, %s, %v", proc.ID, proc.Path, proc.Tree)
173173
e.UpdateItem(proc)
174174
}
175175
}
@@ -263,7 +263,7 @@ func (e *EventsStore) Delete(key int) {
263263
e.mu.Lock()
264264
defer e.mu.Unlock()
265265
if !ev.Proc.IsAlive() {
266-
log.Debug("[cache delete] deleted %d: %s", key, ev.Proc.Path)
266+
log.Trace("[cache delete] deleted %d: %s", key, ev.Proc.Path)
267267
delete(e.eventByPID, key)
268268
}
269269
})
@@ -280,7 +280,7 @@ func (e *EventsStore) DeleteOldItems() {
280280
log.Debug("[cache] deleting old events, total byPID: %d", len(e.eventByPID))
281281
for k, item := range e.eventByPID {
282282
if !item.isValid() && !item.Proc.IsAlive() {
283-
log.Debug("[cache] deleting old item: %d", k)
283+
log.Trace("[cache] deleting old item: %d", k)
284284
delete(e.eventByPID, k)
285285
}
286286
}

daemon/procmon/ebpf/utils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func byteArrayToString(arr []byte) string {
5959

6060
func deleteEbpfEntry(proto string, key unsafe.Pointer) bool {
6161
if err := m.DeleteElement(ebpfMaps[proto].bpfmap, key); err != nil {
62-
log.Debug("error deleting ebpf entry: %s", err)
62+
log.Trace("error deleting ebpf entry: %s", err)
6363
return false
6464
}
6565
return true
@@ -88,7 +88,7 @@ func getItems(proto string, isIPv6 bool) (items uint) {
8888
ok, err := m.LookupNextElement(mp.bpfmap, unsafe.Pointer(&lookupKey[0]),
8989
unsafe.Pointer(&nextKey[0]), unsafe.Pointer(&value))
9090
if !ok || err != nil { //reached end of map
91-
log.Debug("[ebpf] %s map: %d active items", proto, items)
91+
log.Trace("[ebpf] %s map: %d active items", proto, items)
9292
return
9393
}
9494
if firstrun {

0 commit comments

Comments
 (0)