← Back to branch summary

~ubuntu-branches/ubuntu/trusty/juju-core/trusty

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/state/apiserver/apiserver.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-03-24 16:05:44 UTC
  • mfrom: (1.1.20)
  • Revision ID: package-import@ubuntu.com-20140324160544-g8lsfufby18d5fj4
Tags: 1.17.6-0ubuntu1
https://launchpad.net/bugs/1271144
https://launchpad.net/bugs/1273769
https://launchpad.net/bugs/1248283
https://launchpad.net/bugs/1276909
https://launchpad.net/bugs/1129720
https://launchpad.net/bugs/1240260
* New upstream point release, including fixes for:
  - br0 not bought up by cloud-init with MAAS provider (LP: #1271144).
  - ppc64el enablement for juju/lxc (LP: #1273769).
  - juju userdata should not restart networking (LP: #1248283).
  - error detecting hardware characteristics (LP: #1276909).
  - juju instances not including the default security group (LP: #1129720).
  - juju bootstrap does not honor https_proxy (LP: #1240260).
* d/control,rules: Drop BD on bash-completion, install bash-completion
  direct from upstream source code.
* d/rules: Set HOME prior to generating man pages.
* d/control: Drop alternative dependency on mongodb-server; juju now only
  works on trusty with juju-mongodb.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/launchpad.net/juju-core/state/apiserver/apiserver.go
12
12
        "time"
13
13
 
14
14
        "code.google.com/p/go.net/websocket"
15
 
        "github.com/loggo/loggo"
 
15
        "github.com/juju/loggo"
16
16
        "launchpad.net/tomb"
17
17
 
18
18
        "launchpad.net/juju-core/rpc"
152
152
        }()
153
153
        mux := http.NewServeMux()
154
154
        mux.HandleFunc("/", srv.apiHandler)
155
 
        mux.Handle("/charms", &charmsHandler{state: srv.state, dataDir: srv.dataDir})
 
155
        charmHandler := &charmsHandler{httpHandler: httpHandler{state: srv.state}, dataDir: srv.dataDir}
 
156
        // charmHandler itself provides the errorSender implementation for the embedded httpHandler.
 
157
        charmHandler.httpHandler.errorSender = charmHandler
 
158
        mux.Handle("/charms", charmHandler)
 
159
        toolsHandler := &toolsHandler{httpHandler{state: srv.state}}
 
160
        // toolsHandler itself provides the errorSender implementation for the embedded httpHandler.
 
161
        toolsHandler.httpHandler.errorSender = toolsHandler
 
162
        mux.Handle("/tools", toolsHandler)
156
163
        // The error from http.Serve is not interesting.
157
164
        http.Serve(lis, mux)
158
165
}