commit 90033ec395e028765fa2b757f3a1caadb8c71bc7 · julien.rbrt.fr/tangled-core

+37

spindle/queue/queue.go

···

       1
       1
       +
       package queue

     

       2
       2
       +
       

     

       3
       3
       +
       type Job struct {

     

       4
       4
       +
       	Run    func() error

     

       5
       5
       +
       	OnFail func(error)

     

       6
       6
       +
       }

     

       7
       7
       +
       

     

       8
       8
       +
       type Queue struct {

     

       9
       9
       +
       	jobs chan Job

     

       10
       10
       +
       }

     

       11
       11
       +
       

     

       12
       12
       +
       func NewQueue(size int) *Queue {

     

       13
       13
       +
       	return &Queue{

     

       14
       14
       +
       		jobs: make(chan Job, size),

     

       15
       15
       +
       	}

     

       16
       16
       +
       }

     

       17
       17
       +
       

     

       18
       18
       +
       func (q *Queue) Enqueue(job Job) bool {

     

       19
       19
       +
       	select {

     

       20
       20
       +
       	case q.jobs <- job:

     

       21
       21
       +
       		return true

     

       22
       22
       +
       	default:

     

       23
       23
       +
       		return false

     

       24
       24
       +
       	}

     

       25
       25
       +
       }

     

       26
       26
       +
       

     

       27
       27
       +
       func (q *Queue) StartRunner() {

     

       28
       28
       +
       	go func() {

     

       29
       29
       +
       		for job := range q.jobs {

     

       30
       30
       +
       			if err := job.Run(); err != nil {

     

       31
       31
       +
       				if job.OnFail != nil {

     

       32
       32
       +
       					job.OnFail(err)

     

       33
       33
       +
       				}

     

       34
       34
       +
       			}

     

       35
       35
       +
       		}

     

       36
       36
       +
       	}()

     

       37
       37
       +
       }

+32 -12

spindle/server.go

···

       17
       17
        
       	"tangled.sh/tangled.sh/core/spindle/config"

     

       18
       18
        
       	"tangled.sh/tangled.sh/core/spindle/db"

     

       19
       19
        
       	"tangled.sh/tangled.sh/core/spindle/engine"

     

       20
       20
       +
       	"tangled.sh/tangled.sh/core/spindle/queue"

     

       20
       21
        
       )

     

       21
       22
        
       

     

       22
       23
        
       type Spindle struct {

     
···

       26
       27
        
       	l   *slog.Logger

     

       27
       28
        
       	n   *notifier.Notifier

     

       28
       29
        
       	eng *engine.Engine

     

       30
       30
       +
       	jq  *queue.Queue

     

       29
       31
        
       }

     

       30
       32
        
       

     

       31
       33
        
       func Run(ctx context.Context) error {

     
···

       58
       60
        
       		return err

     

       59
       61
        
       	}

     

       60
       62
        
       

     

       63
       63
       +
       	jq := queue.NewQueue(100)

     

       64
       64
       +
       

     

       65
       65
       +
       	// starts a job queue runner in the background

     

       66
       66
       +
       	jq.StartRunner()

     

       67
       67
       +
       

     

       61
       68
        
       	spindle := Spindle{

     

       62
       69
        
       		jc:  jc,

     

       63
       70
        
       		e:   e,

     
···

       65
       72
        
       		l:   logger,

     

       66
       73
        
       		n:   &n,

     

       67
       74
        
       		eng: eng,

     

       75
       75
       +
       		jq:  jq,

     

       68
       76
        
       	}

     

       69
       77
        
       

     

       78
       78
       +
       	// for each incoming sh.tangled.pipeline, we execute

     

       79
       79
       +
       	// spindle.processPipeline, which in turn enqueues the pipeline

     

       80
       80
       +
       	// job in the above registered queue.

     

       70
       81
        
       	go func() {

     

       71
       82
        
       		logger.Info("starting event consumer")

     

       72
       83
        
       		knotEventSource := knotclient.NewEventSource("localhost:5555")

     
···

       74
       85
        
       		ccfg := knotclient.NewConsumerConfig()

     

       75
       86
        
       		ccfg.Logger = logger

     

       76
       87
        
       		ccfg.Dev = cfg.Server.Dev

     

       77
       77
       -
       		ccfg.ProcessFunc = spindle.exec

     

       88
       88
       +
       		ccfg.ProcessFunc = spindle.processPipeline

     

       78
       89
        
       		ccfg.AddEventSource(knotEventSource)

     

       79
       90
        
       

     

       80
       91
        
       		ec := knotclient.NewEventConsumer(*ccfg)

     
···

       96
       107
        
       	return mux

     

       97
       108
        
       }

     

       98
       109
        
       

     

       99
       99
       -
       func (s *Spindle) exec(ctx context.Context, src knotclient.EventSource, msg knotclient.Message) error {

     

       110
       110
       +
       func (s *Spindle) processPipeline(ctx context.Context, src knotclient.EventSource, msg knotclient.Message) error {

     

       100
       111
        
       	if msg.Nsid == tangled.PipelineNSID {

     

       101
       112
        
       		pipeline := tangled.Pipeline{}

     

       102
       113
        
       		err := json.Unmarshal(msg.EventJson, &pipeline)

     
···

       105
       116
        
       			return err

     

       106
       117
        
       		}

     

       107
       118
        
       

     

       108
       108
       -
       		// this is a "fake" at uri for now

     

       109
       109
       -
       		pipelineAtUri := fmt.Sprintf("at://%s/did:web:%s/%s", tangled.PipelineNSID, pipeline.TriggerMetadata.Repo.Knot, msg.Rkey)

     

       119
       119
       +
       		ok := s.jq.Enqueue(queue.Job{

     

       120
       120
       +
       			Run: func() error {

     

       121
       121
       +
       				// this is a "fake" at uri for now

     

       122
       122
       +
       				pipelineAtUri := fmt.Sprintf("at://%s/did:web:%s/%s", tangled.PipelineNSID, pipeline.TriggerMetadata.Repo.Knot, msg.Rkey)

     

       110
       123
        
       

     

       111
       111
       -
       		rkey := TID()

     

       112
       112
       -
       		err = s.eng.SetupPipeline(ctx, &pipeline, pipelineAtUri, rkey)

     

       113
       113
       -
       		if err != nil {

     

       114
       114
       -
       			return err

     

       115
       115
       -
       		}

     

       116
       116
       -
       		err = s.eng.StartWorkflows(ctx, &pipeline, rkey)

     

       117
       117
       -
       		if err != nil {

     

       118
       118
       -
       			return err

     

       124
       124
       +
       				rkey := TID()

     

       125
       125
       +
       				err = s.eng.SetupPipeline(ctx, &pipeline, pipelineAtUri, rkey)

     

       126
       126
       +
       				if err != nil {

     

       127
       127
       +
       					return err

     

       128
       128
       +
       				}

     

       129
       129
       +
       				return s.eng.StartWorkflows(ctx, &pipeline, rkey)

     

       130
       130
       +
       			},

     

       131
       131
       +
       			OnFail: func(error) {

     

       132
       132
       +
       				s.l.Error("pipeline setup failed", "error", err)

     

       133
       133
       +
       			},

     

       134
       134
       +
       		})

     

       135
       135
       +
       		if ok {

     

       136
       136
       +
       			s.l.Info("pipeline enqueued successfully", "id", msg.Rkey)

     

       137
       137
       +
       		} else {

     

       138
       138
       +
       			s.l.Error("failed to enqueue pipeline: queue is full")

     

       119
       139
        
       		}

     

       120
       140
        
       	}

     

       121
       141