← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to state/apiserver/server.go

Committer: Roger Peppe
Date: 2013-03-05 22:43:34 UTC
mto: (955.3.9 api-deploy) (950.2.9 add-unit-1130150)
mto: This revision was merged to the branch mainline in revision 961.
Revision ID: roger.peppe@canonical.com-20130305224334-s5e2idvahrdll7t8

state/apiserver: continue factoring out

files added:
state/apiserver/error.go

files renamed:
state/api/server/ => state/apiserver/

state/api/api_test.go => state/apiserver/api_test.go

files modified:
cmd/jujud/machine.go

environs/dummy/environs.go

state/api/client.go

state/api/error.go

state/apiserver/apiserver.go

state/apiserver/export_test.go

state/apiserver/server.go

Show diffs side-by-side

added added

removed removed

state/apiserver/server.go

1

package server

1

package apiserver

2

2

3

3

import (

4

4

"code.google.com/p/go.net/websocket"

39

39

state: s,

40

40

addr: lis.Addr(),

41

41

}

42

srv.rpcSrv, err = rpc.NewServer(&srvRoot{}, ServerError)

42

srv.rpcSrv, err = rpc.NewServer(&srvRoot{}, serverError)

43

43

lis = tls.NewListener(lis, &tls.Config{

44

44

Certificates: []tls.Certificate{tlsCert},

45

45

})

Older »