diff --git a/revid/config.go b/revid/config.go index 9c317e9b..010af3fd 100644 --- a/revid/config.go +++ b/revid/config.go @@ -168,15 +168,13 @@ func (c *Config) Validate(r *Revid) error { case logger.Fatal: default: c.LogLevel = defaultVerbosity - c.Logger.Log(logger.Info, pkg+"bad LogLevel mode defined, defaulting", - "LogLevel", defaultVerbosity) + c.Logger.Log(logger.Info, pkg+"bad LogLevel mode defined, defaulting", "LogLevel", defaultVerbosity) } switch c.Input { case Raspivid, V4L, File: case NothingDefined: - c.Logger.Log(logger.Info, pkg+"no input type defined, defaulting", "input", - defaultInput) + c.Logger.Log(logger.Info, pkg+"no input type defined, defaulting", "input", defaultInput) c.Input = defaultInput default: return errors.New("bad input type defined in config") @@ -200,20 +198,16 @@ func (c *Config) Validate(r *Revid) error { } case NothingDefined: - c.Logger.Log(logger.Info, pkg+"no input codec defined, defaulting", - "inputCodec", defaultInputCodec) + c.Logger.Log(logger.Info, pkg+"no input codec defined, defaulting", "inputCodec", defaultInputCodec) c.InputCodec = defaultInputCodec - c.Logger.Log(logger.Info, pkg+"defaulting quantization", "quantization", - defaultQuantization) + c.Logger.Log(logger.Info, pkg+"defaulting quantization", "quantization", defaultQuantization) c.Quantization = defaultQuantization - default: return errors.New("bad input codec defined in config") } if c.Outputs == nil { - c.Logger.Log(logger.Info, pkg+"no output defined, defaulting", "output", - defaultOutput) + c.Logger.Log(logger.Info, pkg+"no output defined, defaulting", "output", defaultOutput) c.Outputs = append(c.Outputs, defaultOutput) c.Packetization = defaultPacketization } else { @@ -229,14 +223,12 @@ func (c *Config) Validate(r *Revid) error { // c.FramesPerClip = httpFramesPerClip break } - c.Logger.Log(logger.Info, pkg+"defaulting frames per clip for rtmp out", - "framesPerClip", defaultFramesPerClip) + c.Logger.Log(logger.Info, pkg+"defaulting frames per clip for rtmp out", "framesPerClip", defaultFramesPerClip) c.FramesPerClip = defaultFramesPerClip c.Packetization = Flv c.SendRetry = true case Http, Rtp: - c.Logger.Log(logger.Info, pkg+"defaulting frames per clip for http out", - "framesPerClip", httpFramesPerClip) + c.Logger.Log(logger.Info, pkg+"defaulting frames per clip for http out", "framesPerClip", httpFramesPerClip) c.FramesPerClip = httpFramesPerClip c.Packetization = Mpegts default: @@ -251,8 +243,7 @@ func (c *Config) Validate(r *Revid) error { } if c.FramesPerClip < 1 { - c.Logger.Log(logger.Info, pkg+"no FramesPerClip defined, defaulting", - "framesPerClip", defaultFramesPerClip) + c.Logger.Log(logger.Info, pkg+"no FramesPerClip defined, defaulting", "framesPerClip", defaultFramesPerClip) c.FramesPerClip = defaultFramesPerClip }