From db5a3e0d0a8bb1a4d24d4c5143ff378e35a57830 Mon Sep 17 00:00:00 2001 From: Michal Niewrzal Date: Fri, 14 Dec 2018 16:55:45 +0100 Subject: [PATCH] Parameters cleanup (#864) * Parameters cleanup * goimports --- pkg/bwagreement/config.go | 1 - pkg/datarepair/checker/config.go | 5 ++--- pkg/piecestore/psclient/client.go | 4 ++-- pkg/piecestore/psserver/agreementsender/agreementsender.go | 4 ++-- pkg/piecestore/psserver/psdb/psdb.go | 2 +- pkg/process/metrics.go | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkg/bwagreement/config.go b/pkg/bwagreement/config.go index 1216d6c44..3d6c89d88 100644 --- a/pkg/bwagreement/config.go +++ b/pkg/bwagreement/config.go @@ -21,7 +21,6 @@ var ( // Config is a configuration struct that is everything you need to start an // agreement receiver responsibility type Config struct { - DatabaseURL string `help:"the database connection string to use" default:"sqlite3://$CONFDIR/bw.db"` } // Run implements the provider.Responsibility interface diff --git a/pkg/datarepair/checker/config.go b/pkg/datarepair/checker/config.go index 1801fde2c..813f6479b 100644 --- a/pkg/datarepair/checker/config.go +++ b/pkg/datarepair/checker/config.go @@ -21,9 +21,8 @@ import ( // Config contains configurable values for checker type Config struct { - QueueAddress string `help:"data checker queue address" default:"redis://127.0.0.1:6378?db=1&password=abc123"` - Interval time.Duration `help:"how frequently checker should audit segments" default:"30s"` - IrreparabledbURL string `help:"the database connection string to use" default:"sqlite3://$CONFDIR/irreparable.db"` + QueueAddress string `help:"data checker queue address" default:"redis://127.0.0.1:6378?db=1&password=abc123"` + Interval time.Duration `help:"how frequently checker should audit segments" default:"30s"` } // Initialize a Checker struct diff --git a/pkg/piecestore/psclient/client.go b/pkg/piecestore/psclient/client.go index 59aacdec6..6917f054c 100644 --- a/pkg/piecestore/psclient/client.go +++ b/pkg/piecestore/psclient/client.go @@ -29,10 +29,10 @@ var ClientError = errs.Class("piecestore client error") var ( defaultBandwidthMsgSize = flag.Int( - "piecestore.rpc.client.default_bandwidth_msg_size", 32*1024, + "piecestore.rpc.client.default-bandwidth-msg-size", 32*1024, "default bandwidth message size in bytes") maxBandwidthMsgSize = flag.Int( - "piecestore.rpc.client.max_bandwidth_msg_size", 64*1024, + "piecestore.rpc.client.max-bandwidth-msg-size", 64*1024, "max bandwidth message size in bytes") ) diff --git a/pkg/piecestore/psserver/agreementsender/agreementsender.go b/pkg/piecestore/psserver/agreementsender/agreementsender.go index 3d91e84fb..6db88a7a4 100644 --- a/pkg/piecestore/psserver/agreementsender/agreementsender.go +++ b/pkg/piecestore/psserver/agreementsender/agreementsender.go @@ -21,8 +21,8 @@ import ( ) var ( - defaultCheckInterval = flag.Duration("piecestore.agreementsender.check_interval", time.Hour, "number of seconds to sleep between agreement checks") - defaultOverlayAddr = flag.String("piecestore.agreementsender.overlay_addr", "127.0.0.1:7777", "Overlay Address") + defaultCheckInterval = flag.Duration("piecestore.agreementsender.check-interval", time.Hour, "number of seconds to sleep between agreement checks") + defaultOverlayAddr = flag.String("piecestore.agreementsender.overlay-addr", "127.0.0.1:7777", "Overlay Address") // ASError wraps errors returned from agreementsender package ASError = errs.Class("agreement sender error") diff --git a/pkg/piecestore/psserver/psdb/psdb.go b/pkg/piecestore/psserver/psdb/psdb.go index be5eaea76..c739977f6 100644 --- a/pkg/piecestore/psserver/psdb/psdb.go +++ b/pkg/piecestore/psserver/psdb/psdb.go @@ -31,7 +31,7 @@ var ( // Error is the default psdb errs class Error = errs.Class("psdb") - defaultCheckInterval = flag.Duration("piecestore.ttl.check_interval", time.Hour, "number of seconds to sleep between ttl checks") + defaultCheckInterval = flag.Duration("piecestore.ttl.check-interval", time.Hour, "number of seconds to sleep between ttl checks") ) // DB is a piece store database diff --git a/pkg/process/metrics.go b/pkg/process/metrics.go index ff818ca62..8462b7fc2 100644 --- a/pkg/process/metrics.go +++ b/pkg/process/metrics.go @@ -24,7 +24,7 @@ var ( "address to send telemetry to") metricApp = flag.String("metrics.app", filepath.Base(os.Args[0]), "application name for telemetry identification") - metricAppSuffix = flag.String("metrics.app_suffix", "-dev", + metricAppSuffix = flag.String("metrics.app-suffix", "-dev", "application suffix") )