Fix merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/b4ccbb1f Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/b4ccbb1f Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/b4ccbb1f Branch: refs/heads/master Commit: b4ccbb1fca54dd2edc7e0b8a4a6eeccc289d8c52 Parents: 67f80fa Author: Robert Butts <robert.o.bu...@gmail.com> Authored: Tue Aug 1 17:26:41 2017 -0600 Committer: Dewayne Richardson <dewr...@apache.org> Committed: Thu Aug 10 09:46:03 2017 -0600 ---------------------------------------------------------------------- traffic_monitor_golang/common/log/log.go | 1 - traffic_monitor_golang/traffic_monitor/config/config.go | 1 - traffic_ops/traffic_ops_golang/config.go | 10 +++++----- 3 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b4ccbb1f/traffic_monitor_golang/common/log/log.go ---------------------------------------------------------------------- diff --git a/traffic_monitor_golang/common/log/log.go b/traffic_monitor_golang/common/log/log.go index a5204b5..e2ff9c8 100644 --- a/traffic_monitor_golang/common/log/log.go +++ b/traffic_monitor_golang/common/log/log.go @@ -23,7 +23,6 @@ package log import ( "fmt" "io" - "io/ioutil" "log" "os" "time" http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b4ccbb1f/traffic_monitor_golang/traffic_monitor/config/config.go ---------------------------------------------------------------------- diff --git a/traffic_monitor_golang/traffic_monitor/config/config.go b/traffic_monitor_golang/traffic_monitor/config/config.go index 358541b..3939587 100644 --- a/traffic_monitor_golang/traffic_monitor/config/config.go +++ b/traffic_monitor_golang/traffic_monitor/config/config.go @@ -21,7 +21,6 @@ package config import ( "encoding/json" - "io" "io/ioutil" "time" http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b4ccbb1f/traffic_ops/traffic_ops_golang/config.go ---------------------------------------------------------------------- diff --git a/traffic_ops/traffic_ops_golang/config.go b/traffic_ops/traffic_ops_golang/config.go index 5911204..0c87878 100644 --- a/traffic_ops/traffic_ops_golang/config.go +++ b/traffic_ops/traffic_ops_golang/config.go @@ -48,11 +48,11 @@ type Config struct { LogLocationEvent string `json:"log_location_event"` } -func (c Config) Error() log.LogLocation { return log.LogLocation(c.LogLocationError) } -func (c Config) Warning() log.LogLocation { return log.LogLocation(c.LogLocationWarning) } -func (c Config) Info() log.LogLocation { return log.LogLocation(c.LogLocationInfo) } -func (c Config) Debug() log.LogLocation { return log.LogLocation(c.LogLocationDebug) } -func (c Config) Event() log.LogLocation { return log.LogLocation(c.LogLocationEvent) } +func (c Config) ErrorLog() log.LogLocation { return log.LogLocation(c.LogLocationError) } +func (c Config) WarningLog() log.LogLocation { return log.LogLocation(c.LogLocationWarning) } +func (c Config) InfoLog() log.LogLocation { return log.LogLocation(c.LogLocationInfo) } +func (c Config) DebugLog() log.LogLocation { return log.LogLocation(c.LogLocationDebug) } +func (c Config) EventLog() log.LogLocation { return log.LogLocation(c.LogLocationEvent) } func LoadConfig(fileName string) (Config, error) { if fileName == "" {
