start/stop + default port

Author: maxdml

dbos/admin-server.go

@@ -11,9 +11,9 @@ type AdminServer struct {
 	server *http.Server
 }
 
-func NewAdminServer() *AdminServer {
+func NewAdminServer(port int) *AdminServer {
 	mux := http.NewServeMux()
-	
+
 	// Health endpoint
 	mux.HandleFunc("/dbos-healthz", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
@@ -22,7 +22,7 @@ func NewAdminServer() *AdminServer {
 	})
 
 	server := &http.Server{
-		Addr:    ":3001",
+		Addr:    fmt.Sprintf(":%d", port),
 		Handler: mux,
 	}
 
@@ -33,27 +33,27 @@ func NewAdminServer() *AdminServer {
 
 func (as *AdminServer) Start() error {
 	getLogger().Info("Starting admin server", "port", 3001)
-	
+
 	go func() {
 		if err := as.server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
 			getLogger().Error("Admin server error", "error", err)
 		}
 	}()
-	
+
 	return nil
 }
 
 func (as *AdminServer) Shutdown() error {
 	getLogger().Info("Shutting down admin server")
-	
+
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
-	
+
 	if err := as.server.Shutdown(ctx); err != nil {
 		getLogger().Error("Admin server shutdown error", "error", err)
 		return fmt.Errorf("failed to shutdown admin server: %w", err)
 	}
-	
+
 	getLogger().Info("Admin server shutdown complete")
 	return nil
-}
+}

dbos/dbos.go

@@ -16,9 +16,10 @@ import (
 )
 
 var (
-	APP_VERSION string
-	EXECUTOR_ID string
-	APP_ID      string
+	APP_VERSION               string
+	EXECUTOR_ID               string
+	APP_ID                    string
+	DEFAULT_ADMIN_SERVER_PORT = 3001
 )
 
 func computeApplicationVersion() string {
@@ -62,6 +63,7 @@ type executor struct {
 	queueRunnerCtx        context.Context
 	queueRunnerCancelFunc context.CancelFunc
 	queueRunnerDone       chan struct{}
+	adminServer           *AdminServer
 }
 
 var dbos *executor
@@ -89,7 +91,7 @@ func getLogger() *slog.Logger {
 
 type config struct {
 	logger      *slog.Logger
-	adminServer *AdminServer
+	adminServer bool
 }
 
 type LaunchOption func(*config)
@@ -102,11 +104,7 @@ func WithLogger(logger *slog.Logger) LaunchOption {
 
 func WithAdminServer() LaunchOption {
 	return func(config *config) {
-		if config.adminServer == nil {
-			config.adminServer = NewAdminServer()
-		} else {
-			getLogger().Warn("Admin server already initialized, ignoring duplicate call")
-		}
+		config.adminServer = true
 	}
 }
 
@@ -149,6 +147,18 @@ func Launch(options ...LaunchOption) error {
 
 	systemDB.Launch(context.Background())
 
+	// Start the admin server if configured
+	var adminServer *AdminServer
+	if config.adminServer {
+		adminServer = NewAdminServer(DEFAULT_ADMIN_SERVER_PORT)
+		err := adminServer.Start()
+		if err != nil {
+			logger.Error("Failed to start admin server", "error", err)
+			return NewInitializationError(fmt.Sprintf("failed to start admin server: %v", err))
+		}
+		logger.Info("Admin server started", "port", DEFAULT_ADMIN_SERVER_PORT)
+	}
+
 	// Create context with cancel function for queue runner
 	ctx, cancel := context.WithCancel(context.Background())
 
@@ -157,6 +167,7 @@ func Launch(options ...LaunchOption) error {
 		queueRunnerCtx:        ctx,
 		queueRunnerCancelFunc: cancel,
 		queueRunnerDone:       make(chan struct{}),
+		adminServer:           adminServer,
 	}
 
 	// Start the queue runner in a goroutine
@@ -218,6 +229,16 @@ func Shutdown() {
 		dbos.systemDB = nil
 	}
 
+	if dbos.adminServer != nil {
+		err := dbos.adminServer.Shutdown()
+		if err != nil {
+			getLogger().Error("Failed to shutdown admin server", "error", err)
+		} else {
+			getLogger().Info("Admin server shutdown complete")
+		}
+		dbos.adminServer = nil
+	}
+
 	if logger != nil {
 		logger = nil
 	}