Adding support for SWIFT object stores and adding updates to changes …

…to tes schema.
simonovic86 · Oct 5, 2016 · e6d9bb7 · e6d9bb7
1 parent 545639f
commit e6d9bb7
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 72 deletions.
diff --git a/src/ga4gh-engine/worker/container_engine.go b/src/ga4gh-engine/worker/container_engine.go
@@ -75,7 +75,7 @@ func (self *DockerEngine) Run(containerName string, args []string,
 	if err != nil {
 		log.Printf("docker %s error: %s", container.ID, err)
 	} else {
-		log.Printf("docker %s complete", container.ID, err)
+		log.Printf("docker %s complete", container.ID)
 	}
 
 	if stdout != nil {

diff --git a/src/ga4gh-engine/worker/swift_client.go b/src/ga4gh-engine/worker/swift_client.go
@@ -1,13 +1,13 @@
 package ga4gh_taskengine_worker
 
 import (
+	"fmt"
 	"github.com/rackspace/gophercloud"
 	"github.com/rackspace/gophercloud/openstack"
 	"io"
+	"log"
 	"os"
-	"fmt"
 	"strings"
-	"log"
 	//"github.com/rackspace/gophercloud/openstack/objectstorage/v1/containers"
 	"github.com/rackspace/gophercloud/openstack/objectstorage/v1/objects"
 	//"github.com/rackspace/gophercloud/pagination"
@@ -74,7 +74,7 @@ func (self *SwiftAccess) Put(storage string, hostPath string, directory bool) er
 	if err != nil {
 		return err
 	}
-	
+
 	storage = strings.TrimPrefix(storage, SWIFT_PROTOCOL)
 	storage_split := strings.SplitN(storage, "/", 2)
 

diff --git a/src/ga4gh-tasks/task_execution.pb.go b/src/ga4gh-tasks/task_execution.pb.go
diff --git a/task-execution-schemas b/task-execution-schemas
+4 −3		proto/task_execution.proto
+11 −8		swagger/proto/task_execution.swagger.json