From 5c94f556b4ed7d48864a17d6f963cbfc9d31e9a1 Mon Sep 17 00:00:00 2001 From: saxon Date: Wed, 19 Sep 2018 22:31:58 +0930 Subject: [PATCH] revid: added pkg name to logging messages in config.go --- revid/config.go | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/revid/config.go b/revid/config.go index fc8f0aa3..d60aa530 100644 --- a/revid/config.go +++ b/revid/config.go @@ -104,6 +104,8 @@ const ( defaultVerbosity = No ) +const pkg = "revid: " + // Validate checks for any errors in the config fields and defaults settings // if particular parameters have not been defined. func (c *Config) Validate(r *Revid) error { @@ -112,7 +114,7 @@ func (c *Config) Validate(r *Revid) error { case No: case NothingDefined: c.Verbosity = defaultVerbosity - c.Logger.Log(smartlogger.Warning, "No verbosity mode defined, defaulting", + c.Logger.Log(smartlogger.Warning, pkg+"No verbosity mode defined, defaulting", "verbosity", defaultVerbosity) default: return errors.New("Bad Verbosity defined in config!") @@ -122,7 +124,7 @@ func (c *Config) Validate(r *Revid) error { case QuantizationOn: case QuantizationOff: case NothingDefined: - c.Logger.Log(smartlogger.Warning, "No quantization mode defined, defaulting", + c.Logger.Log(smartlogger.Warning, pkg+"No quantization mode defined, defaulting", "quantizationMode", QuantizationOff) c.QuantizationMode = QuantizationOff default: @@ -133,7 +135,7 @@ func (c *Config) Validate(r *Revid) error { case Raspivid: case File: case NothingDefined: - c.Logger.Log(smartlogger.Warning, "No input type defined, defaulting", "input", + c.Logger.Log(smartlogger.Warning, pkg+"No input type defined, defaulting", "input", defaultInput) c.Input = defaultInput default: @@ -166,10 +168,10 @@ func (c *Config) Validate(r *Revid) error { } } case NothingDefined: - c.Logger.Log(smartlogger.Warning, "No input codec defined, defaulting", + c.Logger.Log(smartlogger.Warning, pkg+"No input codec defined, defaulting", "inputCodec", defaultInputCodec) c.InputCodec = defaultInputCodec - c.Logger.Log(smartlogger.Warning, "Defaulting quantization", "quantization", + c.Logger.Log(smartlogger.Warning, pkg+"Defaulting quantization", "quantization", defaultQuantization) c.Quantization = defaultQuantization default: @@ -180,20 +182,20 @@ func (c *Config) Validate(r *Revid) error { case File: case Rtmp, FfmpegRtmp: if c.RtmpUrl == "" { - c.Logger.Log(smartlogger.Info, "No RTMP URL: falling back to HTTP") + c.Logger.Log(smartlogger.Info, pkg+"No RTMP URL: falling back to HTTP") c.Output = Http break } - c.Logger.Log(smartlogger.Info, "Defaulting frames per clip for rtmp out", + c.Logger.Log(smartlogger.Info, pkg+"Defaulting frames per clip for rtmp out", "framesPerClip", defaultFramesPerClip) c.FramesPerClip = defaultFramesPerClip case NothingDefined: - c.Logger.Log(smartlogger.Warning, "No output defined, defaulting", "output", + c.Logger.Log(smartlogger.Warning, pkg+"No output defined, defaulting", "output", defaultOutput) c.Output = defaultOutput fallthrough case Http: - c.Logger.Log(smartlogger.Info, "Defaulting frames per clip for http out", + c.Logger.Log(smartlogger.Info, pkg+"Defaulting frames per clip for http out", "framesPerClip", httpFramesPerClip) c.FramesPerClip = httpFramesPerClip default: @@ -205,7 +207,7 @@ func (c *Config) Validate(r *Revid) error { case Mpegts: case Flv: case NothingDefined: - c.Logger.Log(smartlogger.Warning, "No packetization option defined, defaulting", + c.Logger.Log(smartlogger.Warning, pkg+"No packetization option defined, defaulting", "packetization", defaultPacketization) c.Packetization = defaultPacketization default: @@ -216,7 +218,7 @@ func (c *Config) Validate(r *Revid) error { case Yes: case No: case NothingDefined: - c.Logger.Log(smartlogger.Warning, "No horizontal flip option defined, defaulting", + c.Logger.Log(smartlogger.Warning, pkg+"No horizontal flip option defined, defaulting", "horizontalFlip", defaultHorizontalFlip) c.HorizontalFlip = defaultHorizontalFlip default: @@ -227,7 +229,7 @@ func (c *Config) Validate(r *Revid) error { case Yes: case No: case NothingDefined: - c.Logger.Log(smartlogger.Warning, "No vertical flip option defined, defaulting", + c.Logger.Log(smartlogger.Warning, pkg+"No vertical flip option defined, defaulting", "verticalFlip", defaultVerticalFlip) c.VerticalFlip = defaultVerticalFlip default: @@ -235,13 +237,13 @@ func (c *Config) Validate(r *Revid) error { } if c.FramesPerClip < 1 { - c.Logger.Log(smartlogger.Warning, "No FramesPerClip defined, defaulting", + c.Logger.Log(smartlogger.Warning, pkg+"No FramesPerClip defined, defaulting", "framesPerClip", defaultFramesPerClip) c.FramesPerClip = defaultFramesPerClip } if c.Width == "" { - c.Logger.Log(smartlogger.Warning, "No width defined, defaulting", "width", + c.Logger.Log(smartlogger.Warning, pkg+"No width defined, defaulting", "width", defaultWidth) c.Width = defaultWidth } else { @@ -251,7 +253,7 @@ func (c *Config) Validate(r *Revid) error { } if c.Height == "" { - c.Logger.Log(smartlogger.Warning, "No height defined, defaulting", "height", + c.Logger.Log(smartlogger.Warning, pkg+"No height defined, defaulting", "height", defaultHeight) c.Height = defaultHeight } else { @@ -261,7 +263,7 @@ func (c *Config) Validate(r *Revid) error { } if c.FrameRate == "" { - c.Logger.Log(smartlogger.Warning, "No frame rate defined, defaulting", "fps", + c.Logger.Log(smartlogger.Warning, pkg+"No frame rate defined, defaulting", "fps", defaultFrameRate) c.FrameRate = defaultFrameRate } else { @@ -271,7 +273,7 @@ func (c *Config) Validate(r *Revid) error { } if c.Bitrate == "" { - c.Logger.Log(smartlogger.Warning, "No bitrate defined, defaulting", "bitrate", + c.Logger.Log(smartlogger.Warning, pkg+"No bitrate defined, defaulting", "bitrate", defaultBitrate) c.Bitrate = defaultBitrate } else { @@ -281,7 +283,7 @@ func (c *Config) Validate(r *Revid) error { } if c.Timeout == "" { - c.Logger.Log(smartlogger.Warning, "No timeout defined, defaulting", "timeout", defaultTimeout) + c.Logger.Log(smartlogger.Warning, pkg+"No timeout defined, defaulting", "timeout", defaultTimeout) c.Timeout = defaultTimeout } else { if integer, err := strconv.Atoi(c.Timeout); integer < 0 || err != nil { @@ -290,7 +292,7 @@ func (c *Config) Validate(r *Revid) error { } if c.IntraRefreshPeriod == "" { - c.Logger.Log(smartlogger.Warning, "No intra refresh defined, defaulting", "intraRefresh", + c.Logger.Log(smartlogger.Warning, pkg+"No intra refresh defined, defaulting", "intraRefresh", defaultIntraRefreshPeriod) c.IntraRefreshPeriod = defaultIntraRefreshPeriod } else { @@ -300,7 +302,7 @@ func (c *Config) Validate(r *Revid) error { } if c.Quantization == "" { - c.Logger.Log(smartlogger.Warning, "No quantization defined, defaulting", "quantization", + c.Logger.Log(smartlogger.Warning, pkg+"No quantization defined, defaulting", "quantization", defaultQuantization) c.Quantization = defaultQuantization } else {