Error handling instead of panic, year corrected in license

intelsdi-x · Sep 7, 2016 · 630c119 · 630c119
1 parent fbde67a
commit 630c119
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/plugin/publisher/snap-plugin-publisher-mock-file-grpc/README.md b/plugin/publisher/snap-plugin-publisher-mock-file-grpc/README.md
@@ -2,7 +2,7 @@
 http://www.apache.org/licenses/LICENSE-2.0.txt
 
 
-Copyright 2015 Intel Corporation
+Copyright 2016 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/plugin/publisher/snap-plugin-publisher-mock-file-grpc/file/file.go b/plugin/publisher/snap-plugin-publisher-mock-file-grpc/file/file.go
@@ -2,7 +2,7 @@
 http://www.apache.org/licenses/LICENSE-2.0.txt
 
 
-Copyright 2015 Intel Corporation
+Copyright 2016 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -79,10 +79,14 @@ func (f *filePublisher) Publish(metrics []plugin.Metric, config plugin.Config) e
 func (f *filePublisher) GetConfigPolicy() (plugin.ConfigPolicy, error) {
 	policy := plugin.NewConfigPolicy()
 	rule1, err := plugin.NewStringRule("file", true)
-	handleErr(err)
+	if err != nil {
+		return *policy, err
+	}
 
 	rule2, err := plugin.NewBoolRule(debug, false)
-	handleErr(err)
+	if err != nil {
+		return *policy, err
+	}
 
 	policy.AddStringRule([]string{""}, rule1)
 	policy.AddBoolRule([]string{}, rule2)
@@ -101,9 +105,3 @@ func formatMetricTagsAsString(metricTags map[string]string) string {
 
 	return "tags[" + tags + "]"
 }
-
-func handleErr(e error) {
-	if e != nil {
-		panic(e)
-	}
-}
diff --git a/plugin/publisher/snap-plugin-publisher-mock-file-grpc/main.go b/plugin/publisher/snap-plugin-publisher-mock-file-grpc/main.go
@@ -2,7 +2,7 @@
 http://www.apache.org/licenses/LICENSE-2.0.txt
 
 
-Copyright 2015 Intel Corporation
+Copyright 2016 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/plugin/publisher/snap-plugin-publisher-mock-file-grpc/main_small_test.go b/plugin/publisher/snap-plugin-publisher-mock-file-grpc/main_small_test.go
@@ -4,7 +4,7 @@
 http://www.apache.org/licenses/LICENSE-2.0.txt
 
 
-Copyright 2015 Intel Corporation
+Copyright 2016 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

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
@@ -4,7 +4,7 @@
 http://www.apache.org/licenses/LICENSE-2.0.txt
 
 
-Copyright 2015 Intel Corporation
+Copyright 2016 Intel Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.