Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmd/livepeer: Add httpIngest, localVerify to default cfg #2646

Merged
merged 2 commits into from
Nov 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG_PENDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 4 additions & 3 deletions cmd/livepeer/livepeer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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")
Expand Down
12 changes: 12 additions & 0 deletions cmd/livepeer/starter/starter.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,12 @@ func DefaultLivepeerConfig() LivepeerConfig {
defaultMetadataAmqpExchange := "lp_golivepeer_metadata"
defaultMetadataPublishTimeout := 1 * time.Second

// Ingest:
defaultHttpIngest := true

// Verification:
defaultLocalVerify := true

// Storage:
defaultDatadir := ""
defaultObjectstore := ""
Expand Down Expand Up @@ -256,6 +262,12 @@ func DefaultLivepeerConfig() LivepeerConfig {
MetadataAmqpExchange: &defaultMetadataAmqpExchange,
MetadataPublishTimeout: &defaultMetadataPublishTimeout,

// Ingest:
HttpIngest: &defaultHttpIngest,

// Verification:
LocalVerify: &defaultLocalVerify,

// Storage:
Datadir: &defaultDatadir,
Objectstore: &defaultObjectstore,
Expand Down