Refactor module startup

elasticsearch/es.go

@@ -2,10 +2,10 @@ package elasticsearch
 
 import (
 	"fmt"
+	"github.com/joshrendek/threat.gg-agent/honeypots"
 	"net/http"
 	"strings"
 
-	"github.com/joshrendek/threat.gg-agent/honeypots"
 	"github.com/joshrendek/threat.gg-agent/persistence"
 	"github.com/joshrendek/threat.gg-agent/proto"
 	"github.com/joshrendek/threat.gg-agent/stats"
@@ -76,8 +76,9 @@ func (e *ES) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprintf(w, resp)
 }
 
-func init() {
-	honeypots.Register(&honeypot{logger: zerolog.New(os.Stdout).With().Str("honeypot", "elasticsearch").Logger()})
+func New() honeypots.Honeypot {
+	h := &honeypot{logger: zerolog.New(os.Stdout).With().Caller().Str("honeypot", "elasticsearch").Logger()}
+	return h
 }
 
 func (h *honeypot) Name() string {

ftp/go-ftp.go

@@ -53,8 +53,9 @@ type honeypot struct {
 	logger zerolog.Logger
 }
 
-func init() {
-	honeypots.Register(&honeypot{logger: zerolog.New(os.Stdout).With().Caller().Str("honeypot", "ftp").Logger()})
+func New() honeypots.Honeypot {
+	h := &honeypot{logger: zerolog.New(os.Stdout).With().Caller().Str("honeypot", "ftp").Logger()}
+	return h
 }
 
 func (h *honeypot) Name() string {

honeypots/honeypots.go

@@ -1,8 +1,6 @@
 package honeypots
 
 import (
-	"fmt"
-
 	"github.com/jellydator/ttlcache/v3"
 	"github.com/rs/zerolog/log"
 )
@@ -22,7 +20,6 @@ func Register(h Honeypot) {
 }
 
 func StartHoneypots() {
-	fmt.Println("--------> honeypots: ", honeypots)
 	for _, h := range honeypots {
 		log.Info().Str("honeypot", h.Name()).Msg("starting")
 		go h.Start()