fix: replace binary before copying to store

Change-Id: I2810f1900b4bef3caa97f07494d23cc340333545
storj · Oct 27, 2024 · 525c637 · 525c637
1 parent f5d66cc
commit 525c637
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -38,11 +38,7 @@ services:
       STORJ_CONSOLE_ADDRESS: 0.0.0.0:10000
       STORJ_CONSOLE_AUTH_TOKEN_SECRET: my-suppa-secret-key
       STORJ_CONSOLE_EXTERNAL_ADDRESS: http://localhost:10000/
-      STORJ_CONSOLE_GATEWAY_CREDENTIALS_REQUEST_URL: http://localhost:8888
-      STORJ_CONSOLE_LINKSHARING_URL: http://localhost:9090
       STORJ_CONSOLE_OPEN_REGISTRATION_ENABLED: "true"
-      STORJ_CONSOLE_PUBLIC_LINKSHARING_URL: http://localhost:9090
-      STORJ_CONSOLE_RATE_LIMIT_BURST: "10000"
       STORJ_CONSOLE_SIGNUP_ACTIVATION_CODE_ENABLED: "false"
       STORJ_CONTACT_EXTERNAL_ADDRESS: satellite-api:7777
       STORJ_DATABASE: cockroach://root@cockroach:26257/master?sslmode=disable

diff --git a/supervisor/supervisor.go b/supervisor/supervisor.go
@@ -55,7 +55,9 @@ func (s *Supervisor) Run(ctx context.Context) error {
 			slog.Info("Starting process", slog.String("binary", s.process.binPath))
 			err := s.runProcess(ctx)
 			if err != nil {
-				slog.Error("Failed to run process", "error", err)
+				slog.Error("Process exited with error", "error", err)
+			} else {
+				slog.Info("Process exited")
 			}
 
 			if s.disableAutoRestart {
@@ -87,7 +89,9 @@ func (s *Supervisor) Run(ctx context.Context) error {
 				}
 
 				if updated {
+					// reset the current version to force a new check.
 					curVersion = version.SemVer{}
+					// exit the process to restart it with the new binary.
 					return errSupervisor.Wrap(s.process.exit())
 				}
 

diff --git a/supervisor/updater.go b/supervisor/updater.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"io"
 	"io/fs"
-	"log"
 	"log/slog"
 	"net/http"
 	"os"
@@ -19,12 +18,15 @@ import (
 )
 
 type Updater struct {
+	log *slog.Logger
+
 	checker *checker.Client
 }
 
 // NewUpdater creates a new updater.
-func NewUpdater(checker *checker.Client) *Updater {
+func NewUpdater(log *slog.Logger, checker *checker.Client) *Updater {
 	return &Updater{
+		log:     log,
 		checker: checker,
 	}
 }
@@ -42,7 +44,7 @@ func (u *Updater) Update(ctx context.Context, process *Process, currentVersion v
 	}
 
 	if newVersion.IsZero() {
-		log.Println(reason)
+		u.log.Info(reason)
 		return false, nil
 	}
 
@@ -68,12 +70,13 @@ func (u *Updater) Update(ctx context.Context, process *Process, currentVersion v
 		return false, errs.Combine(err, os.Remove(newVersionPath))
 	}
 
-	if err = copyToStore(ctx, process.storeDir, newVersionPath); err != nil {
+	if err = replaceBinary(ctx, currentVersion, newVersionPath, process.binPath); err != nil {
 		return false, errs.Wrap(err)
 	}
 
-	if err = replaceBinary(ctx, currentVersion, newVersionPath, process.binPath); err != nil {
-		return false, errs.Wrap(err)
+	if err = copyToStore(ctx, process.storeDir, process.binPath); err != nil {
+		// log the error but don't return it as it's not critical;
+		slog.Warn("Error copying binary to store.", "error", err)
 	}
 
 	return true, nil
@@ -104,7 +107,7 @@ func replaceBinary(ctx context.Context, currentVersion version.SemVer, newVersio
 
 	// remove the backup binary
 	if err := os.Remove(backupPath); err != nil && !errs.Is(err, fs.ErrNotExist) {
-		slog.Warn("Error removing backup binary", err)
+		slog.Warn("Error removing backup binary. Consider removing manually", "error", err)
 	}
 
 	return nil