← Back to branch summary

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

« back to all changes in this revision

Viewing changes to server/dev/server.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/dev/server.go
29
29
        "launchpad.net/ubuntu-push/server"
30
30
        "launchpad.net/ubuntu-push/server/api"
31
31
        "launchpad.net/ubuntu-push/server/broker/simple"
 
32
        "launchpad.net/ubuntu-push/server/listener"
32
33
        "launchpad.net/ubuntu-push/server/session"
33
34
        "launchpad.net/ubuntu-push/server/store"
34
35
)
97
98
        handler := api.PanicTo500Handler(mux, logger)
98
99
        go server.HTTPServeRunner(nil, handler, &cfg.HTTPServeParsedConfig, nil)()
99
100
        // listen for device connections
 
101
        resource := &listener.NopSessionResourceManager{}
100
102
        server.DevicesRunner(lst, func(conn net.Conn) error {
101
103
                track := session.NewTracker(logger)
102
104
                return session.Session(conn, broker, cfg, track)
103
 
        }, logger, &cfg.DevicesParsedConfig)()
 
105
        }, logger, resource, &cfg.DevicesParsedConfig)()
104
106
}