state/apiserver: Split Machiner into subpackage

state/apiserver/apiserver.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package apiserver
 
 import (
         "code.google.com/p/go.net/websocket"
         "crypto/tls"
         "launchpad.net/juju-core/log"
         "launchpad.net/juju-core/rpc"
@@ skipping 81 matching lines @@
 
 // Addr returns the address that the server is listening on.
 func (srv *Server) Addr() string {
         return srv.addr.String()
 }
 
 func (srv *Server) serveConn(wsConn *websocket.Conn) error {
         conn := rpc.NewConn(jsoncodec.NewWebsocket(wsConn))
         serverError := func(err error) error {
                 if err := common.ServerError(err); err != nil {
-                        return *err

[rog, 2013/06/06 16:33:31]

s/*err/err/

[dimitern, 2013/06/06 17:10:52]

Done.

+                        return err
                 }
                 return nil
         }
         if err := conn.Serve(newStateServer(srv), serverError); err != nil {
                 return err
         }
         conn.Start()
         select {
         case <-conn.Dead():
         case <-srv.tomb.Dying():
         }
         return conn.Close()
 }
 
 var logRequests = true