Merge pull request #100 from project-flogo/fix-issue-99

Fix issue 99
project-flogo · Apr 27, 2020 · d6de892 · d6de892
2 parents 8b7a53a + 50eb9ba
commit d6de892
Show file tree

Hide file tree

Showing 14 changed files with 143 additions and 76 deletions.
diff --git a/examples/flogo/creditcard/flogo.json b/examples/flogo/creditcard/flogo.json
@@ -6,8 +6,7 @@
   "appModel": "1.0.0",
   "imports": [
     "github.com/project-flogo/contrib/trigger/rest",
-    "github.com/project-flogo/rules/ruleaction",
-    "github.com/project-flogo/legacybridge"
+    "github.com/project-flogo/rules/ruleaction"
   ],
   "triggers": [
     {

diff --git a/examples/flogo/creditcard/imports.go b/examples/flogo/creditcard/imports.go
@@ -0,0 +1,6 @@
+package main
+
+import (
+	_ "github.com/project-flogo/rules/ruleaction"
+	_ "github.com/project-flogo/contrib/trigger/rest"
+)
diff --git a/examples/flogo/creditcard/main.go b/examples/flogo/creditcard/main.go
@@ -9,41 +9,43 @@ import (
 
 	_ "github.com/project-flogo/core/data/expression/script"
 	"github.com/project-flogo/core/engine"
-	"github.com/project-flogo/core/support/log"
-
-	_ "github.com/project-flogo/contrib/trigger/rest"
-	_ "github.com/project-flogo/rules/ruleaction"
 )
 
 var (
 	cpuProfile    = flag.String("cpuprofile", "", "Writes CPU profile to the specified file")
 	memProfile    = flag.String("memprofile", "", "Writes memory profile to the specified file")
 	cfgJson       string
+	cfgEngine     string
 	cfgCompressed bool
 )
 
 func main() {
 
+	cpuProfiling := false
+
 	flag.Parse()
 	if *cpuProfile != "" {
 		f, err := os.Create(*cpuProfile)
 		if err != nil {
-			fmt.Println(fmt.Sprintf("Failed to create CPU profiling file due to error - %s", err.Error()))
+			fmt.Fprintf(os.Stderr, "Failed to create CPU profiling file: %v\n", err)
+			os.Exit(1)
+		}
+		if err = pprof.StartCPUProfile(f); err != nil {
+			fmt.Fprintf(os.Stderr, "Failed to start CPU profiling: %v\n", err)
 			os.Exit(1)
 		}
-		pprof.StartCPUProfile(f)
-		defer pprof.StopCPUProfile()
+		cpuProfiling = true
 	}
 
 	cfg, err := engine.LoadAppConfig(cfgJson, cfgCompressed)
 	if err != nil {
-		log.RootLogger().Errorf("Failed to create engine: %s", err.Error())
+		fmt.Fprintf(os.Stderr, "Failed to create engine: %v\n", err)
 		os.Exit(1)
 	}
 
-	e, err := engine.New(cfg)
+	e, err := engine.New(cfg, engine.ConfigOption(cfgEngine, cfgCompressed))
 	if err != nil {
-		log.RootLogger().Errorf("Failed to create engine: %s", err.Error())
+		fmt.Fprintf(os.Stderr, "Failed to create engine: %v\n", err)
 		os.Exit(1)
 	}
 
@@ -52,17 +54,21 @@ func main() {
 	if *memProfile != "" {
 		f, err := os.Create(*memProfile)
 		if err != nil {
-			fmt.Println(fmt.Sprintf("Failed to create memory profiling file due to error - %s", err.Error()))
+			fmt.Fprintf(os.Stderr, "Failed to create memory profiling file: %v\n", err)
 			os.Exit(1)
 		}
 
 		runtime.GC() // get up-to-date statistics
 		if err := pprof.WriteHeapProfile(f); err != nil {
-			fmt.Println(fmt.Sprintf("Failed to write memory profiling data to file due to error - %s", err.Error()))
+			fmt.Fprintf(os.Stderr, "Failed to write memory profiling data: %v", err)
 			os.Exit(1)
 		}
-		f.Close()
+		_ = f.Close()
+	}
+
+	if cpuProfiling {
+		pprof.StopCPUProfile()
 	}
 
 	os.Exit(code)
-}
+}
diff --git a/examples/flogo/simple-kafka/flogo.json b/examples/flogo/simple-kafka/flogo.json
@@ -4,6 +4,10 @@
   "version": "0.0.1",
   "description": "Sample Flogo App",
   "appModel": "1.0.0",
+  "imports": [
+    "github.com/project-flogo/contrib/trigger/kafka",
+    "github.com/project-flogo/rules/ruleaction"
+  ],
   "triggers": [
     {
       "id": "receive_kafka_message",

diff --git a/examples/flogo/simple-kafka/imports.go b/examples/flogo/simple-kafka/imports.go
@@ -0,0 +1,6 @@
+package main
+
+import (
+	_ "github.com/project-flogo/contrib/trigger/kafka"
+	_ "github.com/project-flogo/rules/ruleaction"
+)
diff --git a/examples/flogo/simple-kafka/main.go b/examples/flogo/simple-kafka/main.go
@@ -9,41 +9,43 @@ import (
 
 	_ "github.com/project-flogo/core/data/expression/script"
 	"github.com/project-flogo/core/engine"
-	"github.com/project-flogo/core/support/log"
-
-	_ "github.com/project-flogo/contrib/trigger/kafka"
-	_ "github.com/project-flogo/rules/ruleaction"
 )
 
 var (
 	cpuProfile    = flag.String("cpuprofile", "", "Writes CPU profile to the specified file")
 	memProfile    = flag.String("memprofile", "", "Writes memory profile to the specified file")
-	cfgJSON       string
+	cfgJson       string
+	cfgEngine     string
 	cfgCompressed bool
 )
 
 func main() {
 
+	cpuProfiling := false
+
 	flag.Parse()
 	if *cpuProfile != "" {
 		f, err := os.Create(*cpuProfile)
 		if err != nil {
-			fmt.Println(fmt.Sprintf("Failed to create CPU profiling file due to error - %s", err.Error()))
+			fmt.Fprintf(os.Stderr, "Failed to create CPU profiling file: %v\n", err)
+			os.Exit(1)
+		}
+		if err = pprof.StartCPUProfile(f); err != nil {
+			fmt.Fprintf(os.Stderr, "Failed to start CPU profiling: %v\n", err)
 			os.Exit(1)
 		}
-		pprof.StartCPUProfile(f)
-		defer pprof.StopCPUProfile()
+		cpuProfiling = true
 	}
 
-	cfg, err := engine.LoadAppConfig(cfgJSON, cfgCompressed)
+	cfg, err := engine.LoadAppConfig(cfgJson, cfgCompressed)
 	if err != nil {
-		log.RootLogger().Errorf("Failed to create engine: %s", err.Error())
+		fmt.Fprintf(os.Stderr, "Failed to create engine: %v\n", err)
 		os.Exit(1)
 	}
 
-	e, err := engine.New(cfg)
+	e, err := engine.New(cfg, engine.ConfigOption(cfgEngine, cfgCompressed))
 	if err != nil {
-		log.RootLogger().Errorf("Failed to create engine: %s", err.Error())
+		fmt.Fprintf(os.Stderr, "Failed to create engine: %v\n", err)
 		os.Exit(1)
 	}
 
@@ -52,17 +54,21 @@ func main() {
 	if *memProfile != "" {
 		f, err := os.Create(*memProfile)
 		if err != nil {
-			fmt.Println(fmt.Sprintf("Failed to create memory profiling file due to error - %s", err.Error()))
+			fmt.Fprintf(os.Stderr, "Failed to create memory profiling file: %v\n", err)
 			os.Exit(1)
 		}
 
 		runtime.GC() // get up-to-date statistics
 		if err := pprof.WriteHeapProfile(f); err != nil {
-			fmt.Println(fmt.Sprintf("Failed to write memory profiling data to file due to error - %s", err.Error()))
+			fmt.Fprintf(os.Stderr, "Failed to write memory profiling data: %v", err)
 			os.Exit(1)
 		}
-		f.Close()
+		_ = f.Close()
+	}
+
+	if cpuProfiling {
+		pprof.StopCPUProfile()
 	}
 
 	os.Exit(code)
-}
+}
diff --git a/examples/flogo/simple/flogo.json b/examples/flogo/simple/flogo.json
@@ -4,6 +4,10 @@
   "version": "0.0.1",
   "description": "Sample Flogo App",
   "appModel": "1.0.0",
+  "imports": [
+    "github.com/project-flogo/contrib/trigger/rest",
+    "github.com/project-flogo/rules/ruleaction"
+  ],
   "triggers": [
     {
       "id": "receive_http_message",

diff --git a/examples/flogo/simple/imports.go b/examples/flogo/simple/imports.go
@@ -0,0 +1,6 @@
+package main
+
+import (
+	_ "github.com/project-flogo/contrib/trigger/rest"
+	_ "github.com/project-flogo/rules/ruleaction"
+)
diff --git a/examples/flogo/simple/main.go b/examples/flogo/simple/main.go
@@ -9,42 +9,43 @@ import (
 
 	_ "github.com/project-flogo/core/data/expression/script"
 	"github.com/project-flogo/core/engine"
-	"github.com/project-flogo/core/support/log"
-
-	_ "github.com/project-flogo/contrib/trigger/rest"
-	_ "github.com/project-flogo/rules/ruleaction"
-
 )
 
 var (
-	cpuProfile = flag.String("cpuprofile", "", "Writes CPU profile to the specified file")
-	memProfile = flag.String("memprofile", "", "Writes memory profile to the specified file")
-	cfgJson string
+	cpuProfile    = flag.String("cpuprofile", "", "Writes CPU profile to the specified file")
+	memProfile    = flag.String("memprofile", "", "Writes memory profile to the specified file")
+	cfgJson       string
+	cfgEngine     string
 	cfgCompressed bool
 )
 
 func main() {
 
+	cpuProfiling := false
+
 	flag.Parse()
 	if *cpuProfile != "" {
 		f, err := os.Create(*cpuProfile)
 		if err != nil {
-			fmt.Println(fmt.Sprintf("Failed to create CPU profiling file due to error - %s", err.Error()))
+			fmt.Fprintf(os.Stderr, "Failed to create CPU profiling file: %v\n", err)
 			os.Exit(1)
 		}
-		pprof.StartCPUProfile(f)
-		defer pprof.StopCPUProfile()
+		if err = pprof.StartCPUProfile(f); err != nil {
+			fmt.Fprintf(os.Stderr, "Failed to start CPU profiling: %v\n", err)
+			os.Exit(1)
+		}
+		cpuProfiling = true
 	}
 
 	cfg, err := engine.LoadAppConfig(cfgJson, cfgCompressed)
 	if err != nil {
-		log.RootLogger().Errorf("Failed to create engine: %s", err.Error())
+		fmt.Fprintf(os.Stderr, "Failed to create engine: %v\n", err)
 		os.Exit(1)
 	}
 
-	e, err := engine.New(cfg)
+	e, err := engine.New(cfg, engine.ConfigOption(cfgEngine, cfgCompressed))
 	if err != nil {
-		log.RootLogger().Errorf("Failed to create engine: %s", err.Error())
+		fmt.Fprintf(os.Stderr, "Failed to create engine: %v\n", err)
 		os.Exit(1)
 	}
 
@@ -53,17 +54,21 @@ func main() {
 	if *memProfile != "" {
 		f, err := os.Create(*memProfile)
 		if err != nil {
-			fmt.Println(fmt.Sprintf("Failed to create memory profiling file due to error - %s", err.Error()))
+			fmt.Fprintf(os.Stderr, "Failed to create memory profiling file: %v\n", err)
 			os.Exit(1)
 		}
 
 		runtime.GC() // get up-to-date statistics
 		if err := pprof.WriteHeapProfile(f); err != nil {
-			fmt.Println(fmt.Sprintf("Failed to write memory profiling data to file due to error - %s", err.Error()))
+			fmt.Fprintf(os.Stderr, "Failed to write memory profiling data: %v", err)
 			os.Exit(1)
 		}
-		f.Close()
+		_ = f.Close()
+	}
+
+	if cpuProfiling {
+		pprof.StopCPUProfile()
 	}
 
 	os.Exit(code)
-}
+}
diff --git a/examples/flogo/trackntrace/flogo.json b/examples/flogo/trackntrace/flogo.json
@@ -3,6 +3,10 @@
   "type": "flogo:app",
   "version": "0.0.1",
   "appModel": "1.0.0",
+  "imports": [
+    "github.com/project-flogo/contrib/trigger/rest",
+    "github.com/project-flogo/rules/ruleaction"
+  ],
   "triggers": [
     {
       "id": "receive_http_message",

diff --git a/examples/flogo/trackntrace/imports.go b/examples/flogo/trackntrace/imports.go
@@ -0,0 +1,6 @@
+package main
+
+import (
+	_ "github.com/project-flogo/contrib/trigger/rest"
+	_ "github.com/project-flogo/rules/ruleaction"
+)