General code cleanup

Removes duplicate return in client/native.go Removes useless TBD comment in control/runner.go Modifies mock-file-grpc/main_test.go to load the correct plugin when testing.
intelsdi-x · Sep 9, 2016 · 372cdb1 · 372cdb1
1 parent 92d4272
commit 372cdb1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/control/plugin/client/native.go b/control/plugin/client/native.go
@@ -168,7 +168,6 @@ func (p *PluginNativeClient) Publish(metrics []core.Metric, config map[string]ct
 	err = p.connection.Call("Publisher.Publish", out, &reply)
 	close(done)
 	return err
-	return nil
 }
 
 func (p *PluginNativeClient) Process(metrics []core.Metric, config map[string]ctypes.ConfigValue) ([]core.Metric, error) {

diff --git a/control/runner.go b/control/runner.go
@@ -57,7 +57,6 @@ const (
 	MaxPluginRestartCount = 3
 )
 
-// TBD
 type executablePlugin interface {
 	Run(time.Duration) (plugin.Response, error)
 	Kill() error

diff --git a/plugin/publisher/snap-plugin-publisher-mock-file-grpc/main_test.go b/plugin/publisher/snap-plugin-publisher-mock-file-grpc/main_test.go
@@ -33,7 +33,7 @@ import (
 )
 
 var (
-	PluginName = "snap-plugin-publisher-mock-file"
+	PluginName = "snap-plugin-publisher-mock-file-grpc"
 	PluginType = "publisher"
 	SnapPath   = os.ExpandEnv(os.Getenv("SNAP_PATH"))
 	PluginPath = path.Join(SnapPath, "plugin", PluginName)