diff --git a/.gitignore b/.gitignore index ebc2dde3b..18b659878 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,6 @@ pprof/* # Database Files *.bin *.gob + +# Nohup Files - https://man7.org/linux/man-pages/man1/nohup.1p.html +nohup.* diff --git a/shared/logger/logger.go b/shared/logger/logger.go index 56742122c..52379a7a6 100644 --- a/shared/logger/logger.go +++ b/shared/logger/logger.go @@ -9,7 +9,7 @@ import ( var Log = logging.MustGetLogger("mizu") var format = logging.MustStringFormatter( - `%{time:2006-01-02T15:04:05.999Z-07:00} %{level:-5s} ▶ %{message} ▶ %{pid} %{shortfile} %{shortfunc}`, + `[%{time:2006-01-02T15:04:05.000-0700}] %{level:-5s} ▶ %{message} ▶ [%{pid} %{shortfile} %{shortfunc}]`, ) func InitLogger(logPath string) { diff --git a/tap/tcp_assembler.go b/tap/tcp_assembler.go index fa0d05c9d..150834967 100644 --- a/tap/tcp_assembler.go +++ b/tap/tcp_assembler.go @@ -16,6 +16,8 @@ import ( "github.com/up9inc/mizu/tap/source" ) +const PACKETS_SEEN_LOG_THRESHOLD = 1000 + type tcpAssembler struct { *reassembly.Assembler streamPool *reassembly.StreamPool @@ -63,7 +65,11 @@ func (a *tcpAssembler) processPackets(dumpPacket bool, packets <-chan source.Tcp for packetInfo := range packets { packetsCount := diagnose.AppStats.IncPacketsCount() - logger.Log.Debugf("PACKET #%d", packetsCount) + + if packetsCount % PACKETS_SEEN_LOG_THRESHOLD == 0 { + logger.Log.Debugf("Packets seen: #%d", packetsCount) + } + packet := packetInfo.Packet data := packet.Data() diagnose.AppStats.UpdateProcessedBytes(uint64(len(data))) @@ -85,7 +91,7 @@ func (a *tcpAssembler) processPackets(dumpPacket bool, packets <-chan source.Tcp CaptureInfo: packet.Metadata().CaptureInfo, } diagnose.InternalStats.Totalsz += len(tcp.Payload) - logger.Log.Debugf("%s : %v -> %s : %v", packet.NetworkLayer().NetworkFlow().Src(), tcp.SrcPort, packet.NetworkLayer().NetworkFlow().Dst(), tcp.DstPort) + logger.Log.Debugf("%s:%v -> %s:%v", packet.NetworkLayer().NetworkFlow().Src(), tcp.SrcPort, packet.NetworkLayer().NetworkFlow().Dst(), tcp.DstPort) a.assemblerMutex.Lock() a.AssembleWithContext(packet.NetworkLayer().NetworkFlow(), tcp, &c) a.assemblerMutex.Unlock()