From eb030fa87b6c89a3905f6fe4e9751dbf2aee82d4 Mon Sep 17 00:00:00 2001 From: Yondon Fu <yondon.fu@gmail.com> Date: Wed, 9 Nov 2022 13:34:44 -0500 Subject: [PATCH 1/2] cmd/livepeer: Add httpIngest, localVerify to default cfg --- cmd/livepeer/livepeer.go | 7 ++++--- cmd/livepeer/starter/starter.go | 12 ++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/cmd/livepeer/livepeer.go b/cmd/livepeer/livepeer.go index 4cf684b78d..6fe7fd17e9 100755 --- 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 index 2a0b55b9ec..15bd6b7124 100755 --- 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, From 0d8f659eb30744e490043e8995ed6f86d25355fa Mon Sep 17 00:00:00 2001 From: Yondon Fu <yondon.fu@gmail.com> Date: Wed, 9 Nov 2022 16:07:38 -0500 Subject: [PATCH 2/2] CHANGELOG_PENDING: Include HttpIngest and LocalVerify in param table --- CHANGELOG_PENDING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md index 7c3b542e97..ab6428bf96 100644 --- 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