particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jobqueue: rename to worker

Browse source 
This package does not contain an actual queue, but a server and client
implementation for osbuild's worker API. Name it accordingly.

The queue is in package `store` right now, but about to be split off.
This rename makes the `jobqueue` name free for that effort.
This commit is contained in:
Lars Karlitski 2020-04-15 23:12:49 +02:00 • committed by Tom Gundersen
parent 76bd5ab984
commit ac40b0e73b
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmd/osbuild-worker/main.go
View file

@ -13,9 +13,9 @@ import (
"path"
"github.com/osbuild/osbuild-composer/internal/common"
"github.com/osbuild/osbuild-composer/internal/jobqueue"
"github.com/osbuild/osbuild-composer/internal/target"
"github.com/osbuild/osbuild-composer/internal/upload/awsupload"
"github.com/osbuild/osbuild-composer/internal/worker"
)
type connectionConfig struct {
@ -61,7 +61,7 @@ func (e *TargetsError) Error() string {
return errString
}
func RunJob(job *jobqueue.Job, uploadFunc func(*jobqueue.Job, io.Reader) error) (*common.ComposeResult, error) {
func RunJob(job *worker.Job, uploadFunc func(*worker.Job, io.Reader) error) (*common.ComposeResult, error) {
tmpStore, err := ioutil.TempDir("/var/tmp", "osbuild-store")
if err != nil {
return nil, fmt.Errorf("error setting up osbuild store: %v", err)
@ -145,9 +145,9 @@ func main() {
flag.Usage()
}
var client *jobqueue.Client
var client *worker.Client
if unix {
client = jobqueue.NewClientUnix(address)
client = worker.NewClientUnix(address)
} else {
conf, err := createTLSConfig(&connectionConfig{
CACertFile: "/etc/osbuild-composer/ca-crt.pem",
@ -158,7 +158,7 @@ func main() {
log.Fatalf("Error creating TLS config: %v", err)
}
client = jobqueue.NewClient(address, conf)
client = worker.NewClient(address, conf)
}
for {