X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/57b96147e575d7630ddf81cbb2c554d3adc9c7e2..d81ed360051af98d7c0fba3afb07a4b5a815ee41:/services/keepstore/keepstore.go

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 1e8c3d1e0f..a363bac255 100644
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
+	"git.curoverse.com/arvados.git/sdk/go/keepclient"
 	"io/ioutil"
 	"log"
 	"net"
@@ -13,8 +14,6 @@ import (
 	"strings"
 	"syscall"
 	"time"
-	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-	"git.curoverse.com/arvados.git/sdk/go/keepclient"
 )
 
 // ======================
@@ -277,19 +276,21 @@ func main() {
 	}
 
 	// Initialize Pull queue and worker
-	arv, err := arvadosclient.MakeArvadosClient()
-	if err != nil {
-		log.Fatalf("Error setting up arvados client %s", err.Error())
-	}
-
-	keepClient, err := keepclient.MakeKeepClient(&arv)
-	if err != nil {
-		log.Fatalf("Error setting up keep client %s", err.Error())
+	keepClient := keepclient.KeepClient{
+		Arvados:       nil,
+		Want_replicas: 1,
+		Using_proxy:   true,
+		Client:        &http.Client{},
 	}
 
+	// Initialize the pullq and worker
 	pullq = NewWorkQueue()
 	go RunPullWorker(pullq, keepClient)
 
+	// Initialize the trashq and worker
+	trashq = NewWorkQueue()
+	go RunTrashWorker(trashq)
+
 	// Shut down the server gracefully (by closing the listener)
 	// if SIGTERM is received.
 	term := make(chan os.Signal, 1)