Merge pull request #2646 from livepeer/yf/flag-updates

cmd/livepeer: Add httpIngest, localVerify to default cfg
livepeer · Nov 9, 2022 · 3b60df2 · 3b60df2
2 parents 372b0d3 + 0d8f659
commit 3b60df2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
@@ -21,6 +21,7 @@
 #### General
 
 - \#2635 Fix entrypoint path in built docker images (@hjpotter92)
+- \#2646 Include HttpIngest and LocalVerify in param table on startup (@yondonfu)
 
 #### Broadcaster
 

diff --git a/cmd/livepeer/livepeer.go b/cmd/livepeer/livepeer.go
@@ -7,13 +7,14 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"github.com/olekukonko/tablewriter"
 	"os"
 	"os/signal"
 	"reflect"
 	"runtime"
 	"time"
 
+	"github.com/olekukonko/tablewriter"
+
 	"github.com/livepeer/go-livepeer/cmd/livepeer/starter"
 	"github.com/livepeer/livepeer-data/pkg/mistconnector"
 	"github.com/peterbourgon/ff/v3"
@@ -119,8 +120,8 @@ func parseLivepeerConfig() starter.LivepeerConfig {
 	cfg.OrchAddr = flag.String("orchAddr", *cfg.OrchAddr, "Comma-separated list of orchestrators to connect to")
 	cfg.VerifierURL = flag.String("verifierUrl", *cfg.VerifierURL, "URL of the verifier to use")
 	cfg.VerifierPath = flag.String("verifierPath", *cfg.VerifierPath, "Path to verifier shared volume")
-	cfg.LocalVerify = flag.Bool("localVerify", true, "Set to true to enable local verification i.e. pixel count and signature verification.")
-	cfg.HttpIngest = flag.Bool("httpIngest", true, "Set to true to enable HTTP ingest")
+	cfg.LocalVerify = flag.Bool("localVerify", *cfg.LocalVerify, "Set to true to enable local verification i.e. pixel count and signature verification.")
+	cfg.HttpIngest = flag.Bool("httpIngest", *cfg.HttpIngest, "Set to true to enable HTTP ingest")
 
 	// Transcoding:
 	cfg.Orchestrator = flag.Bool("orchestrator", *cfg.Orchestrator, "Set to true to be an orchestrator")

diff --git a/cmd/livepeer/starter/starter.go b/cmd/livepeer/starter/starter.go
@@ -185,6 +185,12 @@ func DefaultLivepeerConfig() LivepeerConfig {
 	defaultMetadataAmqpExchange := "lp_golivepeer_metadata"
 	defaultMetadataPublishTimeout := 1 * time.Second
 
+	// Ingest:
+	defaultHttpIngest := true
+
+	// Verification:
+	defaultLocalVerify := true
+
 	// Storage:
 	defaultDatadir := ""
 	defaultObjectstore := ""
@@ -256,6 +262,12 @@ func DefaultLivepeerConfig() LivepeerConfig {
 		MetadataAmqpExchange:   &defaultMetadataAmqpExchange,
 		MetadataPublishTimeout: &defaultMetadataPublishTimeout,
 
+		// Ingest:
+		HttpIngest: &defaultHttpIngest,
+
+		// Verification:
+		LocalVerify: &defaultLocalVerify,
+
 		// Storage:
 		Datadir:     &defaultDatadir,
 		Objectstore: &defaultObjectstore,