fix go run for integration (#741)

This commit is contained in:
b00ris 2020-07-14 04:56:29 +03:00 committed by GitHub
parent 9d1ba168de
commit 6e8c027d68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 62 additions and 55 deletions

View File

@ -1,4 +1,4 @@
package main package commands
import "github.com/spf13/cobra" import "github.com/spf13/cobra"

View File

@ -1,4 +1,4 @@
package main package commands
import ( import (
"bytes" "bytes"

View File

@ -1,4 +1,4 @@
package main package commands
import ( import (
"context" "context"

View File

@ -0,0 +1,55 @@
package commands
import (
"context"
"fmt"
"github.com/ledgerwatch/turbo-geth/cmd/utils"
"github.com/ledgerwatch/turbo-geth/internal/debug"
"github.com/ledgerwatch/turbo-geth/log"
"github.com/spf13/cobra"
"os"
"os/signal"
"syscall"
)
var rootCmd = &cobra.Command{
Use: "integration",
Short: "long and heavy integration tests for turbo-geth",
PersistentPreRun: func(cmd *cobra.Command, args []string) {
if err := debug.SetupCobra(cmd); err != nil {
panic(err)
}
},
PersistentPostRun: func(cmd *cobra.Command, args []string) {
debug.Exit()
},
}
func init() {
utils.CobraFlags(rootCmd, append(debug.Flags, utils.MetricsEnabledFlag, utils.MetricsEnabledExpensiveFlag))
}
func rootContext() context.Context {
ctx, cancel := context.WithCancel(context.Background())
go func() {
ch := make(chan os.Signal, 1)
signal.Notify(ch, os.Interrupt, syscall.SIGTERM)
defer signal.Stop(ch)
select {
case <-ch:
log.Info("Got interrupt, shutting down...")
case <-ctx.Done():
}
cancel()
}()
return ctx
}
func Execute() {
if err := rootCmd.ExecuteContext(rootContext()); err != nil {
fmt.Println(err)
os.Exit(1)
}
}

View File

@ -1,4 +1,4 @@
package main package commands
import ( import (
"context" "context"

View File

@ -1,4 +1,4 @@
package main package commands
import ( import (
"bytes" "bytes"

View File

@ -1,56 +1,8 @@
package main package main
import ( import "github.com/ledgerwatch/turbo-geth/cmd/integration/commands"
"context"
"fmt"
"os"
"os/signal"
"syscall"
"github.com/ledgerwatch/turbo-geth/cmd/utils"
"github.com/ledgerwatch/turbo-geth/internal/debug"
"github.com/ledgerwatch/turbo-geth/log"
"github.com/spf13/cobra"
)
var rootCmd = &cobra.Command{
Use: "integration",
Short: "long and heavy integration tests for turbo-geth",
PersistentPreRun: func(cmd *cobra.Command, args []string) {
if err := debug.SetupCobra(cmd); err != nil {
panic(err)
}
},
PersistentPostRun: func(cmd *cobra.Command, args []string) {
debug.Exit()
},
}
func init() {
utils.CobraFlags(rootCmd, append(debug.Flags, utils.MetricsEnabledFlag, utils.MetricsEnabledExpensiveFlag))
}
func main() { func main() {
if err := rootCmd.ExecuteContext(rootContext()); err != nil { commands.Execute()
fmt.Println(err)
os.Exit(1)
}
} }
func rootContext() context.Context {
ctx, cancel := context.WithCancel(context.Background())
go func() {
ch := make(chan os.Signal, 1)
signal.Notify(ch, os.Interrupt, syscall.SIGTERM)
defer signal.Stop(ch)
select {
case <-ch:
log.Info("Got interrupt, shutting down...")
case <-ctx.Done():
}
cancel()
}()
return ctx
}