luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #34 from hashicorp/f-server-logging

Browse source 
Added logging to server startup so we can see where it fails
This commit is contained in:
Chris Bednarski 2015-09-11 11:20:20 -07:00
parent 3ce09d5c34 da93d4a30f
commit 5afa7e4681
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
client/driver/docker.go
View file

@ -138,7 +138,7 @@ func (d *DockerDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle
// Download the image
pull, err := exec.Command("docker", "pull", image).CombinedOutput()
if err != nil {
d.logger.Printf("[ERROR] driver.docker: pulling container %s", pull)
d.logger.Printf("[ERR] driver.docker: pulling container %s", pull)
return nil, fmt.Errorf("Failed to pull `%s`: %s", image, err)
}
d.logger.Printf("[DEBUG] driver.docker: docker pull %s:\n%s", image, pull)
@ -148,7 +148,7 @@ func (d *DockerDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle
imageIDBytes, err := exec.Command("docker", "images", "-q", "--no-trunc", image).CombinedOutput()
imageID := strings.TrimSpace(string(imageIDBytes))
if err != nil || imageID == "" {
d.logger.Printf("[ERROR] driver.docker: getting image id %s", imageID)
d.logger.Printf("[ERR] driver.docker: getting image id %s", imageID)
return nil, fmt.Errorf("Failed to determine image id for `%s`: %s", image, err)
}
if !reDockerSha.MatchString(imageID) {
@ -160,7 +160,7 @@ func (d *DockerDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle
// Create a container
container, err := client.CreateContainer(containerOptionsForTask(task, d.logger))
if err != nil {
d.logger.Printf("[ERROR] driver.docker: %s", err)
d.logger.Printf("[ERR] driver.docker: %s", err)
return nil, fmt.Errorf("Failed to create container from image %s", image)
}
if !reDockerSha.MatchString(container.ID) {
@ -171,7 +171,7 @@ func (d *DockerDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle
// Start the container
startBytes, err := exec.Command("docker", "start", container.ID).CombinedOutput()
if err != nil {
d.logger.Printf("[ERROR] driver.docker: starting container %s", strings.TrimSpace(string(startBytes)))
d.logger.Printf("[ERR] driver.docker: starting container %s", strings.TrimSpace(string(startBytes)))
return nil, fmt.Errorf("Failed to start container %s", container.ID)
}
d.logger.Printf("[INFO] driver.docker: started container %s", container.ID)
@ -230,7 +230,7 @@ func (h *dockerHandle) ID() string {
}
data, err := json.Marshal(pid)
if err != nil {
h.logger.Printf("[ERROR] driver.docker: failed to marshal docker PID to JSON: %s", err)
h.logger.Printf("[ERR] driver.docker: failed to marshal docker PID to JSON: %s", err)
}
return fmt.Sprintf("DOCKER:%s", string(data))
}
@ -249,7 +249,7 @@ func (h *dockerHandle) Kill() error {
// Stop the container
stop, err := exec.Command("docker", "stop", "-t", "5", h.containerID).CombinedOutput()
if err != nil {
log.Printf("[ERROR] driver.docker: stopping container %s", stop)
log.Printf("[ERR] driver.docker: stopping container %s", stop)
return fmt.Errorf("Failed to stop container %s: %s", h.containerID, err)
}
log.Printf("[INFO] driver.docker: stopped container %s", h.containerID)
@ -257,7 +257,7 @@ func (h *dockerHandle) Kill() error {
// Cleanup container
rmContainer, err := exec.Command("docker", "rm", h.containerID).CombinedOutput()
if err != nil {
log.Printf("[ERROR] driver.docker: removing container %s", rmContainer)
log.Printf("[ERR] driver.docker: removing container %s", rmContainer)
return fmt.Errorf("Failed to remove container %s: %s", h.containerID, err)
}
log.Printf("[INFO] driver.docker: removed container %s", h.containerID)
@ -277,7 +277,7 @@ func (h *dockerHandle) run() {
// Wait for it...
waitBytes, err := exec.Command("docker", "wait", h.containerID).Output()
if err != nil {
h.logger.Printf("[ERROR] driver.docker: unable to wait for %s; container already terminated", h.containerID)
h.logger.Printf("[ERR] driver.docker: unable to wait for %s; container already terminated", h.containerID)
}
wait := strings.TrimSpace(string(waitBytes))

2
client/driver/qemu.go
View file

@ -235,7 +235,7 @@ func (h *qemuHandle) ID() string {
}
data, err := json.Marshal(pid)
if err != nil {
log.Printf("[ERROR] failed to marshal Qemu PID to JSON: %s", err)
log.Printf("[ERR] failed to marshal Qemu PID to JSON: %s", err)
}
return fmt.Sprintf("QEMU:%s", string(data))
}

8
nomad/server.go
View file

@ -181,27 +181,35 @@ func NewServer(config *Config) (*Server, error) {
// Initialize the RPC layer
// TODO: TLS...
logger.Printf("[INFO] nomad: starting RPC layer")
if err := s.setupRPC(nil); err != nil {
s.Shutdown()
logger.Printf("[ERR] nomad: failed to start RPC layer: %s", err)
return nil, fmt.Errorf("Failed to start RPC layer: %v", err)
}
// Initialize the Raft server
logger.Printf("[INFO] nomad: starting Raft")
if err := s.setupRaft(); err != nil {
s.Shutdown()
logger.Printf("[ERR] nomad: failed to start Raft: %s", err)
return nil, fmt.Errorf("Failed to start Raft: %v", err)
}
// Initialize the wan Serf
logger.Printf("[INFO] nomad: starting serf WAN")
s.serf, err = s.setupSerf(config.SerfConfig, s.eventCh, serfSnapshot)
if err != nil {
s.Shutdown()
logger.Printf("[ERR] nomad: failed to start serf WAN: %s", err)
return nil, fmt.Errorf("Failed to start serf: %v", err)
}
// Intialize the scheduling workers
logger.Printf("[INFO] nomad: starting workers")
if err := s.setupWorkers(); err != nil {
s.Shutdown()
logger.Printf("[ERR] nomad: failed to start workers: %s", err)
return nil, fmt.Errorf("Failed to start workers: %v", err)
}