← Back to branch summary

~ps-jenkins/ubuntu-push/ubuntu-vivid-proposed

« back to all changes in this revision

Viewing changes to server/session/session.go

  • Committer: Roberto Alsina
  • Date: 2014-10-24 14:05:51 UTC
  • mfrom: (91.179.41 automatic)
  • mto: This revision was merged to the branch mainline in revision 136.
  • Revision ID: roberto.alsina@canonical.com-20141024140551-tsdz3xggo2rbwlqj
Merge from automatic

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/session/session.go
36
36
}
37
37
 
38
38
// sessionStart manages the start of the protocol session.
39
 
func sessionStart(proto protocol.Protocol, brkr broker.Broker, cfg SessionConfig, sessionId string) (broker.BrokerSession, error) {
 
39
func sessionStart(proto protocol.Protocol, brkr broker.Broker, cfg SessionConfig, track SessionTracker) (broker.BrokerSession, error) {
40
40
        var connMsg protocol.ConnectMsg
41
41
        proto.SetDeadline(time.Now().Add(cfg.ExchangeTimeout()))
42
42
        err := proto.ReadMessage(&connMsg)
53
53
        if err != nil {
54
54
                return nil, err
55
55
        }
56
 
        return brkr.Register(&connMsg, sessionId)
 
56
        return brkr.Register(&connMsg, track)
57
57
}
58
58
 
59
59
var errOneway = errors.New("oneway")
204
204
                return track.End(&broker.ErrAbort{"unexpected wire format version"})
205
205
        }
206
206
        proto := protocol.NewProtocol0(conn)
207
 
        sess, err := sessionStart(proto, brkr, cfg, track.SessionId())
 
207
        sess, err := sessionStart(proto, brkr, cfg, track)
208
208
        if err != nil {
209
209
                return track.End(err)
210
210
        }