failed attempt to fix shutdown code path

attack_logger.go

@@ -112,6 +112,7 @@ func (a *AttackJsonLogger) Publish(report *AttackReport) {
 }
 
 func (a *AttackJsonLogger) Close() {
+	log.Print("closing attack json logger\n")
 	var err error
 
 	err = a.BufWriter.Flush()

inquisition.go

@@ -111,6 +111,7 @@ func NewConnection() *Connection {
 
 func (c *Connection) Close() {
 	c.AttackLogger.Close()
+	c.PacketLogger.Close()
 }
 
 // PacketLoggerWrite writes the specified raw packet to the raw packet log.
@@ -631,6 +632,13 @@ func NewConnTracker() *ConnTracker {
 	}
 }
 
+func (c *ConnTracker) Close() {
+	for k, v := range c.flowAMap {
+		log.Printf("ConnTracker: closing %s\n", k.String())
+		v.Close()
+	}
+}
+
 // Has returns true if the given TcpIpFlow is a key in our
 // either of flowAMap or flowBMap
 func (c *ConnTracker) Has(key TcpIpFlow) bool {

pcap_loggers.go

@@ -26,6 +26,7 @@ import (
 	"code.google.com/p/gopacket/layers"
 	"code.google.com/p/gopacket/pcapgo"
 	"fmt"
+	"log"
 	"os"
 	"path/filepath"
 	"time"
@@ -90,6 +91,10 @@ func NewPcapLogger(dir string, flow TcpIpFlow) *PcapLogger {
 }
 
 func (p *PcapLogger) WritePacket(packet []byte) {
+	p.writeChan <- packet
+}
+
+func (p *PcapLogger) HandleWrite(packet []byte) {
 	err := p.writer.WritePacket(gopacket.CaptureInfo{
 		Timestamp:     time.Now(),
 		CaptureLength: len(packet),
@@ -101,9 +106,27 @@ func (p *PcapLogger) WritePacket(packet []byte) {
 }
 
 func (p *PcapLogger) Close() {
+	log.Print("closing pcap logger\n")
+	var err error
+
+	p.closeChan <- true
 	close(p.writeChan)
 	close(p.closeChan)
-	p.fileHandle.Close()
+
+	p.bufWriter.Flush()
+	if err != nil {
+		panic(err)
+	}
+
+	err = p.fileHandle.Sync()
+	if err != nil {
+		panic(err)
+	}
+
+	err = p.fileHandle.Close()
+	if err != nil {
+		panic(err)
+	}
 }
 
 func (p *PcapLogger) StartWriter() {
@@ -116,7 +139,7 @@ func (p *PcapLogger) startWriter() {
 		case <-p.closeChan:
 			return
 		case packetBytes := <-p.writeChan:
-			p.WritePacket(packetBytes)
+			p.HandleWrite(packetBytes)
 		}
 	}
 }

service.go

@@ -70,11 +70,13 @@ func (b *HoneyBadgerService) Start() {
 
 // Stop the HoneyBadgerService
 func (b *HoneyBadgerService) Stop() {
-	b.stopChan <- true
 	b.stopDecodeChan <- true
+	b.stopChan <- true
 	close(b.stopChan)
 	close(b.rawPacketChan)
 	close(b.stopDecodeChan)
+
+	b.connTracker.Close()
 }
 
 // startDecodingTcp calls decodeTcp in a new goroutine...