simplify healthcheck and override port

.gitignore

@@ -16,3 +16,4 @@
 conf.*yml
 fox
 dockervol/
+*.priv

bot/bot.go

@@ -2,13 +2,14 @@ package bot
 
 import (
 	"fmt"
+	"net/http"
 	"sync"
 
 	"github.com/Depado/fox/acl"
 	"github.com/Depado/fox/cmd"
 	"github.com/Depado/fox/commands"
-	"github.com/Depado/fox/healthcheck"
 	"github.com/bwmarrin/discordgo"
+	"github.com/gin-gonic/gin"
 	"github.com/rs/zerolog"
 )
 
@@ -75,9 +76,14 @@ func (b *Bot) AddCommand(c commands.Command) {
 	}
 }
 
-func Run(l *zerolog.Logger, b *Bot, c *cmd.Conf, r *healthcheck.HealthCheck) {
+func Run(l *zerolog.Logger, b *Bot, c *cmd.Conf) {
 	go func() {
-		if err := r.Engine.Run(fmt.Sprintf(":%d", c.Port)); err != nil {
+		gin.SetMode("release")
+		r := gin.New()
+		r.GET("/", func(c *gin.Context) {
+			c.Status(http.StatusOK)
+		})
+		if err := r.Run(fmt.Sprintf(":%d", c.Port)); err != nil {
 			l.Fatal().Err(err).Msg("unable to start healthcheck router")
 		}
 	}()

cmd/conf.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"strconv"
 	"strings"
 
 	"github.com/rs/zerolog"
@@ -103,5 +104,15 @@ func NewConf() (*Conf, error) {
 		return conf, fmt.Errorf("unable to unmarshal conf: %w", err)
 	}
 
+	// Override port value for top-level declaration
+	p := os.Getenv("PORT")
+	if p != "" {
+		port, err := strconv.Atoi(p)
+		if err != nil {
+			return conf, fmt.Errorf("given port isn't an integer: %w", err)
+		}
+		conf.Port = port
+	}
+
 	return conf, nil
 }

main.go

@@ -12,7 +12,6 @@ import (
 	"github.com/Depado/fox/bot"
 	"github.com/Depado/fox/cmd"
 	"github.com/Depado/fox/commands"
-	"github.com/Depado/fox/healthcheck"
 	"github.com/Depado/fox/player"
 	"github.com/Depado/fox/session"
 	sp "github.com/Depado/fox/soundcloud"
@@ -43,7 +42,7 @@ var versionCmd = &cobra.Command{
 func run() {
 	fx.New(
 		fx.Provide(
-			cmd.NewConf, cmd.NewLogger, acl.NewACL, healthcheck.NewHealthcheck,
+			cmd.NewConf, cmd.NewLogger, acl.NewACL,
 			session.NewDiscordSession,
 			player.NewPlayer,
 			soundcloud.NewAutoIDClient, sp.NewSoundCloudProvider,