From 6435b23c6bf70e4c5f63abac2e4c1de7daefddb4 Mon Sep 17 00:00:00 2001 From: Malisa Smith Date: Fri, 14 Oct 2016 11:19:08 -0700 Subject: [PATCH] change package prefixes to tes --- src/tes-server/server.go | 6 +++--- src/tes-worker/worker.go | 12 ++++++------ src/tes/server/task_boltdb.go | 2 +- src/tes/server/task_server.go | 2 +- src/tes/worker/container.go | 2 +- src/tes/worker/container_engine.go | 2 +- src/tes/worker/engine.go | 2 +- src/tes/worker/file_client.go | 2 +- src/tes/worker/fork_engine.go | 2 +- src/tes/worker/fs_client.go | 2 +- src/tes/worker/swift_client.go | 4 ++-- src/tes/worker/util.go | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/tes-server/server.go b/src/tes-server/server.go index 4793cc0..169279c 100644 --- a/src/tes-server/server.go +++ b/src/tes-server/server.go @@ -39,9 +39,9 @@ func main() { } //setup GRPC listener - taski := ga4gh_task.NewTaskBolt(*task_db, meta_data) - - server := ga4gh_task.NewGA4GHServer() + taski := tes_server.NewTaskBolt(*task_db, meta_data) + + server := tes_server.NewGA4GHServer() server.RegisterTaskServer(taski) server.RegisterScheduleServer(taski) server.Start(*rpc_port) diff --git a/src/tes-worker/worker.go b/src/tes-worker/worker.go index 04ef010..901c803 100644 --- a/src/tes-worker/worker.go +++ b/src/tes-worker/worker.go @@ -34,7 +34,7 @@ func main() { defer conn.Close() sched_client := ga4gh_task_ref.NewSchedulerClient(conn) - var file_client ga4gh_taskengine_worker.FileSystemAccess = nil + var file_client tes_taskengine_worker.FileSystemAccess = nil if *swift_dir_arg != "" { storage_dir, _ := filepath.Abs(*swift_dir_arg) @@ -42,24 +42,24 @@ func main() { os.Mkdir(storage_dir, 0700) } - file_client = ga4gh_taskengine_worker.NewSwiftAccess() + file_client = tes_taskengine_worker.NewSwiftAccess() } else { storage_dir, _ := filepath.Abs(*storage_dir_arg) if _, err := os.Stat(storage_dir); os.IsNotExist(err) { os.Mkdir(storage_dir, 0700) } - file_client = ga4gh_taskengine_worker.NewSharedFS(storage_dir) + file_client = tes_taskengine_worker.NewSharedFS(storage_dir) } - file_mapper := ga4gh_taskengine_worker.NewFileMapper(&sched_client, file_client, volume_dir) + file_mapper := tes_taskengine_worker.NewFileMapper(&sched_client, file_client, volume_dir) u, _ := uuid.NewV4() - manager, _ := ga4gh_taskengine_worker.NewLocalManager(*nworker, u.String()) + manager, _ := tes_taskengine_worker.NewLocalManager(*nworker, u.String()) if *timeout_arg <= 0 { manager.Run(sched_client, *file_mapper) } else { var start_count int32 = 0 last_ping := time.Now().Unix() - manager.SetStatusCheck(func(status ga4gh_taskengine_worker.EngineStatus) { + manager.SetStatusCheck(func(status tes_taskengine_worker.EngineStatus) { if status.JobCount > start_count || status.ActiveJobs > 0 { start_count = status.JobCount last_ping = time.Now().Unix() diff --git a/src/tes/server/task_boltdb.go b/src/tes/server/task_boltdb.go index 241b6f0..61bab13 100644 --- a/src/tes/server/task_boltdb.go +++ b/src/tes/server/task_boltdb.go @@ -1,4 +1,4 @@ -package ga4gh_task +package tes_server import ( "fmt" diff --git a/src/tes/server/task_server.go b/src/tes/server/task_server.go index 52151e5..c484afe 100644 --- a/src/tes/server/task_server.go +++ b/src/tes/server/task_server.go @@ -1,4 +1,4 @@ -package ga4gh_task +package tes_server import ( "tes/server/proto" diff --git a/src/tes/worker/container.go b/src/tes/worker/container.go index 8780081..393fa32 100644 --- a/src/tes/worker/container.go +++ b/src/tes/worker/container.go @@ -1,4 +1,4 @@ -package ga4gh_taskengine_worker +package tes_taskengine_worker import ( "github.com/fsouza/go-dockerclient" diff --git a/src/tes/worker/container_engine.go b/src/tes/worker/container_engine.go index 2019728..72d2d08 100644 --- a/src/tes/worker/container_engine.go +++ b/src/tes/worker/container_engine.go @@ -1,4 +1,4 @@ -package ga4gh_taskengine_worker +package tes_taskengine_worker import ( "github.com/docker/engine-api/client" diff --git a/src/tes/worker/engine.go b/src/tes/worker/engine.go index 9f397a5..0d4caa2 100644 --- a/src/tes/worker/engine.go +++ b/src/tes/worker/engine.go @@ -1,4 +1,4 @@ -package ga4gh_taskengine_worker +package tes_taskengine_worker import ( "fmt" diff --git a/src/tes/worker/file_client.go b/src/tes/worker/file_client.go index 336a1a7..63a96b5 100644 --- a/src/tes/worker/file_client.go +++ b/src/tes/worker/file_client.go @@ -1,4 +1,4 @@ -package ga4gh_taskengine_worker +package tes_taskengine_worker import ( "fmt" diff --git a/src/tes/worker/fork_engine.go b/src/tes/worker/fork_engine.go index 376a307..7a3c9be 100644 --- a/src/tes/worker/fork_engine.go +++ b/src/tes/worker/fork_engine.go @@ -1,4 +1,4 @@ -package ga4gh_taskengine_worker +package tes_taskengine_worker import ( "tes/server/proto" diff --git a/src/tes/worker/fs_client.go b/src/tes/worker/fs_client.go index f2fca76..d55e708 100644 --- a/src/tes/worker/fs_client.go +++ b/src/tes/worker/fs_client.go @@ -1,4 +1,4 @@ -package ga4gh_taskengine_worker +package tes_taskengine_worker import ( "fmt" diff --git a/src/tes/worker/swift_client.go b/src/tes/worker/swift_client.go index a726345..bdc1060 100644 --- a/src/tes/worker/swift_client.go +++ b/src/tes/worker/swift_client.go @@ -1,4 +1,4 @@ -package ga4gh_taskengine_worker +package tes_taskengine_worker import ( "fmt" @@ -77,7 +77,7 @@ func (self *SwiftAccess) Put(storage string, hostPath string, class string) erro storage = strings.TrimPrefix(storage, SWIFT_PROTOCOL) storage_split := strings.SplitN(storage, "/", 2) - + if class == "File" { // Now execute the upload opts := objects.CreateOpts{} diff --git a/src/tes/worker/util.go b/src/tes/worker/util.go index 743ba6c..0c87370 100644 --- a/src/tes/worker/util.go +++ b/src/tes/worker/util.go @@ -1,4 +1,4 @@ -package ga4gh_taskengine_worker +package tes_taskengine_worker import ( "fmt"