commit fa63ed0b24e423866a8d4bcc0abd8c25b7c98d1f · edavis.dev/monarch

+15 -5
cmd/monarch/main.go
···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
       +
       	"errors"

     

       5
       6
        
       	"fmt"

     

       6
       7
        
       	"log/slog"

     

       7
       8
        
       	"os"

     

       8
       9
        
       	"os/signal"

     

       9
       10
        
       	"runtime"

     

       10
       10
       -
       	"syscall"

     

       11
       11
        
       	"time"

     

       12
       12
        
       

     

       13
       13
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     
···

       135
       135
        
       	}

     

       136
       136
        
       

     

       137
       137
        
       	app.Action = func(cctx *cli.Context) error {

     

       138
       138
       -
       		ctx, cancel := signal.NotifyContext(context.TODO(), syscall.SIGINT, syscall.SIGTERM)

     

       139
       139
       -
       		defer cancel()

     

       138
       138
       +
       		ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)

     

       139
       139
       +
       		defer stop()

     

       140
       140
        
       

     

       141
       141
        
       		statedburl := cctx.String("state-db-url")

     

       142
       142
        
       		contentdburl := cctx.String("content-db-url")

     
···

       158
       158
        
       		}

     

       159
       159
        
       

     

       160
       160
        
       		<-ctx.Done()

     

       161
       161
       +
       		stop()

     

       161
       162
        
       		slog.Info("shutting down")

     

       162
       163
        
       

     

       163
       164
        
       		endctx, cancel := context.WithTimeout(context.TODO(), time.Minute)

     

       164
       165
        
       		defer cancel()

     

       165
       166
        
       

     

       166
       166
       -
       		if err := app.Stop(endctx); err != nil {

     

       167
       167
       -
       			slog.Error("error during shutdown", "err", err)

     

       167
       167
       +
       		go func() {

     

       168
       168
       +
       			if err := app.Stop(endctx); err != nil {

     

       169
       169
       +
       				slog.Error("error during shutdown", "err", err)

     

       170
       170
       +
       			}

     

       171
       171
       +
       		}()

     

       172
       172
       +
       

     

       173
       173
       +
       		select {

     

       174
       174
       +
       		case <-endctx.Done():

     

       175
       175
       +
       			if errors.Is(endctx.Err(), context.DeadlineExceeded) {

     

       176
       176
       +
       				slog.Info("timeout exceeded")

     

       177
       177
       +
       			}

     

       168
       178
        
       		}

     

       169
       179
        
       

     

       170
       180
        
       		return nil