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"
         "launchpad.net/juju-core/rpc/jsoncodec"
         "launchpad.net/juju-core/state"
+        "launchpad.net/juju-core/state/apiserver/common"
         "launchpad.net/tomb"
         "net"
         "net/http"
         "sync"
 )
 
 // Server holds the server side of the API.
 type Server struct {
         tomb  tomb.Tomb
         wg    sync.WaitGroup
@@ skipping 66 matching lines @@
         http.Serve(lis, handler)
 }
 
 // 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
+                }
+                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