fix(shutdown): fix crash when shutting down before server and task scheduler have started.

pkg/api/controller.go

@@ -370,13 +370,18 @@ func (c *Controller) LoadNewConfig(newConfig *config.Config) {
 
 func (c *Controller) Shutdown() {
 	c.StopBackgroundTasks()
-	ctx := context.Background()
-	_ = c.Server.Shutdown(ctx)
+
+	if c.Server != nil {
+		ctx := context.Background()
+		_ = c.Server.Shutdown(ctx)
+	}
 }
 
 // Will stop scheduler and wait for all tasks to finish their work.
 func (c *Controller) StopBackgroundTasks() {
-	c.taskScheduler.Shutdown()
+	if c.taskScheduler != nil {
+		c.taskScheduler.Shutdown()
+	}
 }
 
 func (c *Controller) StartBackgroundTasks() {

pkg/cli/server/config_reloader.go

@@ -21,7 +21,7 @@
 func NewHotReloader(ctlr *api.Controller, filePath string) (*HotReloader, error) {
 	// creates a new file watcher
 	watcher, err := fsnotify.NewWatcher()
 	if err != nil {
 		return nil, err
 	}
 
@@ -36,13 +36,11 @@
 
 func signalHandler(ctlr *api.Controller, sigCh chan os.Signal) {
 	// if signal then shutdown
 	if sig, ok := <-sigCh; ok {
 		ctlr.Log.Info().Interface("signal", sig).Msg("received signal")
 
 		// gracefully shutdown http server
 		ctlr.Shutdown() //nolint: contextcheck
-
-		close(sigCh)
 	}
 }
 
@@ -61,8 +59,6 @@
 func (hr *HotReloader) Start() {
 	done := make(chan bool)
 
-	initShutDownRoutine(hr.ctlr)
-
 	// run watcher
 	go func() {
 		defer hr.watcher.Close()
@@ -72,13 +68,13 @@
 				select {
 				// watch for events
 				case event := <-hr.watcher.Events:
 					if event.Op == fsnotify.Write {
 						log.Info().Msg("config file changed, trying to reload config")
 
 						newConfig := config.New()
 
 						err := LoadConfiguration(newConfig, hr.filePath)
 						if err != nil {
 							log.Error().Err(err).Msg("failed to reload config, retry writing it.")
 
 							continue
@@ -100,7 +96,7 @@
 			}
 		}()
 
 		if err := hr.watcher.Add(hr.filePath); err != nil {
 			log.Panic().Err(err).Str("config", hr.filePath).Msg("failed to add config file to fsnotity watcher")
 		}
 

pkg/cli/server/root.go

@@ -45,7 +45,7 @@
 		Short:   "`serve` stores and distributes OCI images",
 		Long:    "`serve` stores and distributes OCI images",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) > 0 {
 				if err := LoadConfiguration(conf, args[0]); err != nil {
 					return err
 				}
@@ -55,7 +55,7 @@
 
 			// config reloader
 			hotReloader, err := NewHotReloader(ctlr, args[0])
 			if err != nil {
 				ctlr.Log.Error().Err(err).Msg("failed to create a new hot reloader")
 
 				return err
@@ -69,6 +69,8 @@
 				return err
 			}
 
+			initShutDownRoutine(ctlr)
+
 			if err := ctlr.Run(); err != nil {
 				log.Error().Err(err).Msg("failed to start controller, exiting")
 			}