Skip to content

Commit

Permalink
change package prefixes to tes
Browse files Browse the repository at this point in the history
  • Loading branch information
Malisa Smith committed Oct 14, 2016
1 parent 1166849 commit 6435b23
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions src/tes-server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions src/tes-worker/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,32 +34,32 @@ 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)
if _, err := os.Stat(storage_dir); os.IsNotExist(err) {
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()
Expand Down
2 changes: 1 addition & 1 deletion src/tes/server/task_boltdb.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ga4gh_task
package tes_server

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion src/tes/server/task_server.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ga4gh_task
package tes_server

import (
"tes/server/proto"
Expand Down
2 changes: 1 addition & 1 deletion src/tes/worker/container.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ga4gh_taskengine_worker
package tes_taskengine_worker

import (
"github.com/fsouza/go-dockerclient"
Expand Down
2 changes: 1 addition & 1 deletion src/tes/worker/container_engine.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ga4gh_taskengine_worker
package tes_taskengine_worker

import (
"github.com/docker/engine-api/client"
Expand Down
2 changes: 1 addition & 1 deletion src/tes/worker/engine.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ga4gh_taskengine_worker
package tes_taskengine_worker

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion src/tes/worker/file_client.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ga4gh_taskengine_worker
package tes_taskengine_worker

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion src/tes/worker/fork_engine.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ga4gh_taskengine_worker
package tes_taskengine_worker

import (
"tes/server/proto"
Expand Down
2 changes: 1 addition & 1 deletion src/tes/worker/fs_client.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ga4gh_taskengine_worker
package tes_taskengine_worker

import (
"fmt"
Expand Down
4 changes: 2 additions & 2 deletions src/tes/worker/swift_client.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ga4gh_taskengine_worker
package tes_taskengine_worker

import (
"fmt"
Expand Down Expand Up @@ -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{}
Expand Down
2 changes: 1 addition & 1 deletion src/tes/worker/util.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ga4gh_taskengine_worker
package tes_taskengine_worker

import (
"fmt"
Expand Down

0 comments on commit 6435b23

Please sign in to comment.