Fix TO client Login, add stats UserAgent
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/34c4a6a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/34c4a6a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/34c4a6a7 Branch: refs/heads/master Commit: 34c4a6a75b8e85081c24fecb78acf088e5380926 Parents: 06e4e91 Author: Robert Butts <robert.o.bu...@gmail.com> Authored: Tue Feb 14 10:20:54 2017 -0700 Committer: Dave Neuman <neu...@apache.org> Committed: Sun Feb 19 18:56:44 2017 -0700 ---------------------------------------------------------------------- traffic_ops/client/traffic_ops.go | 2 +- traffic_stats/traffic_stats.go | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/34c4a6a7/traffic_ops/client/traffic_ops.go ---------------------------------------------------------------------- diff --git a/traffic_ops/client/traffic_ops.go b/traffic_ops/client/traffic_ops.go index 40b43e5..624346f 100644 --- a/traffic_ops/client/traffic_ops.go +++ b/traffic_ops/client/traffic_ops.go @@ -127,7 +127,7 @@ func ResumeSession(toURL string, insecure bool) (*Session, error) { } // Deprecated: Login is deprecated, use LoginWithAgent instead. The `Login` function with its present signature will be removed in the next version and replaced with `Login(toURL string, toUser string, toPasswd string, insecure bool, userAgent string)`. The `LoginWithAgent` function will be removed the version after that. -func Login(toURL string, toUser string, toPasswd string, insecure bool, userAgent string) (*Session, error) { +func Login(toURL string, toUser string, toPasswd string, insecure bool) (*Session, error) { return LoginWithAgent(toURL, toUser, toPasswd, insecure, "traffic-ops-client") // TODO add version } http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/34c4a6a7/traffic_stats/traffic_stats.go ---------------------------------------------------------------------- diff --git a/traffic_stats/traffic_stats.go b/traffic_stats/traffic_stats.go index 18419ca..3d474c0 100644 --- a/traffic_stats/traffic_stats.go +++ b/traffic_stats/traffic_stats.go @@ -40,6 +40,8 @@ import ( influx "github.com/influxdata/influxdb/client/v2" ) +const UserAgent = "traffic-stats" + const ( // FATAL will exit after printing error FATAL = iota @@ -412,7 +414,7 @@ func queryDB(con influx.Client, cmd string, database string) (res []influx.Resul } func writeSummaryStats(config StartupConfig, statsSummary traffic_ops.StatsSummary) { - to, err := traffic_ops.Login(config.ToURL, config.ToUser, config.ToPasswd, true) + to, err := traffic_ops.LoginWithAgent(config.ToURL, config.ToUser, config.ToPasswd, true, UserAgent) if err != nil { newErr := fmt.Errorf("Could not store summary stats! Error logging in to %v: %v", config.ToURL, err) log.Error(newErr) @@ -426,7 +428,7 @@ func writeSummaryStats(config StartupConfig, statsSummary traffic_ops.StatsSumma func getToData(config StartupConfig, init bool, configChan chan RunningConfig) { var runningConfig RunningConfig - to, err := traffic_ops.Login(config.ToURL, config.ToUser, config.ToPasswd, true) + to, err := traffic_ops.LoginWithAgent(config.ToURL, config.ToUser, config.ToPasswd, true, UserAgent) if err != nil { msg := fmt.Sprintf("Error logging in to %v: %v", config.ToURL, err) if init {
