You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2018/05/29 21:53:26 UTC
[incubator-trafficcontrol] 02/04: added missing xmpp_id and
xmpp_passwd
This is an automated email from the ASF dual-hosted git repository.
dangogh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit d044ecbab27b33de50937b7c17c7b4eedc0059e7
Author: Dewayne Richardson <de...@apache.org>
AuthorDate: Tue May 29 14:54:39 2018 -0600
added missing xmpp_id and xmpp_passwd
(cherry picked from commit 70785ae1c205c6b0e8b0600ae3dd1e1fdf6a6f06)
---
traffic_ops/traffic_ops_golang/server/servers.go | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/traffic_ops/traffic_ops_golang/server/servers.go b/traffic_ops/traffic_ops_golang/server/servers.go
index 60a4682..8fbcb71 100644
--- a/traffic_ops/traffic_ops_golang/server/servers.go
+++ b/traffic_ops/traffic_ops_golang/server/servers.go
@@ -413,7 +413,9 @@ router_port_name=:router_port_name,
status=:status_id,
tcp_port=:tcp_port,
type=:server_type_id,
-upd_pending=:upd_pending
+upd_pending=:upd_pending,
+xmpp_id=:xmpp_id,
+xmpp_passwd=:xmpp_passwd
WHERE id=:id RETURNING last_updated`
return query
}
@@ -442,8 +444,10 @@ func (server *TOServer) Create(db *sqlx.DB, user auth.CurrentUser) (error, tc.Ap
log.Error.Printf("could not begin transaction: %v", err)
return tc.DBError, tc.SystemError
}
+
if server.XMPPID == nil || *server.XMPPID == "" {
- server.XMPPID = server.HostName
+ hostName := *server.HostName
+ server.XMPPID = &hostName
}
resultRows, err := tx.NamedQuery(insertQuery(), server)
@@ -522,7 +526,10 @@ router_port_name,
status,
tcp_port,
type,
-upd_pending) VALUES (
+upd_pending,
+xmpp_id,
+xmpp_passwd
+) VALUES (
:cachegroup_id,
:cdn_id,
:domain_name,
@@ -552,7 +559,10 @@ upd_pending) VALUES (
:status_id,
:tcp_port,
:server_type_id,
-:upd_pending) RETURNING id,last_updated`
+:upd_pending,
+:xmpp_id,
+:xmpp_passwd
+) RETURNING id,last_updated`
return query
}
--
To stop receiving notification emails like this one, please contact
dangogh@apache.org.