Merge pull request #199 from jwilder/jw-errors

Fix error message capitalization

Author: jwilder

cmd/docker-gen/main.go

@@ -127,13 +127,13 @@ func main() {
 		for _, configFile := range configFiles {
 			err := loadConfig(configFile)
 			if err != nil {
-				log.Fatalf("error loading config %s: %s\n", configFile, err)
+				log.Fatalf("Error loading config %s: %s\n", configFile, err)
 			}
 		}
 	} else {
 		w, err := dockergen.ParseWait(wait)
 		if err != nil {
-			log.Fatalf("error parsing wait interval: %s\n", err)
+			log.Fatalf("Error parsing wait interval: %s\n", err)
 		}
 		config := dockergen.Config{
 			Template:         flag.Arg(0),
@@ -174,10 +174,10 @@ func main() {
 	})
 
 	if err != nil {
-		log.Fatalf("error creating generator: %v", err)
+		log.Fatalf("Error creating generator: %v", err)
 	}
 
 	if err := generator.Generate(); err != nil {
-		log.Fatalf("error running generate: %v", err)
+		log.Fatalf("Error running generate: %v", err)
 	}
 }

generator.go

@@ -51,7 +51,7 @@ func NewGenerator(gc GeneratorConfig) (*generator, error) {
 
 	apiVersion, err := client.Version()
 	if err != nil {
-		log.Printf("error retrieving docker server version info: %s\n", err)
+		log.Printf("Error retrieving docker server version info: %s\n", err)
 	}
 
 	// Grab the docker daemon info once and hold onto it
@@ -116,7 +116,7 @@ func (g *generator) generateFromSignals() {
 func (g *generator) generateFromContainers() {
 	containers, err := g.getContainers()
 	if err != nil {
-		log.Printf("error listing containers: %s\n", err)
+		log.Printf("Error listing containers: %s\n", err)
 		return
 	}
 	for _, config := range g.Configs.Config {
@@ -344,7 +344,7 @@ func (g *generator) sendSignalToContainer(config Config) {
 func (g *generator) getContainers() ([]*RuntimeContainer, error) {
 	apiInfo, err := g.Client.Info()
 	if err != nil {
-		log.Printf("error retrieving docker server info: %s\n", err)
+		log.Printf("Error retrieving docker server info: %s\n", err)
 	} else {
 		SetServerInfo(apiInfo)
 	}
@@ -361,7 +361,7 @@ func (g *generator) getContainers() ([]*RuntimeContainer, error) {
 	for _, apiContainer := range apiContainers {
 		container, err := g.Client.InspectContainer(apiContainer.ID)
 		if err != nil {
-			log.Printf("error inspecting container: %s: %s\n", apiContainer.ID, err)
+			log.Printf("Error inspecting container: %s: %s\n", apiContainer.ID, err)
 			continue
 		}
 

reflect.go

@@ -40,7 +40,7 @@ func deepGet(item interface{}, path string) interface{} {
 				return deepGet(mapValue.Interface(), strings.Join(parts[1:], "."))
 			}
 		default:
-			log.Printf("can't group by %s (value %v, kind %s)\n", path, itemValue, itemValue.Kind())
+			log.Printf("Can't group by %s (value %v, kind %s)\n", path, itemValue, itemValue.Kind())
 		}
 		return nil
 	}

template.go

@@ -500,31 +500,31 @@ func GenerateFile(config Config, containers Context) bool {
 			os.Remove(dest.Name())
 		}()
 		if err != nil {
-			log.Fatalf("unable to create temp file: %s\n", err)
+			log.Fatalf("Cnable to create temp file: %s\n", err)
 		}
 
 		if n, err := dest.Write(contents); n != len(contents) || err != nil {
-			log.Fatalf("failed to write to temp file: wrote %d, exp %d, err=%v", n, len(contents), err)
+			log.Fatalf("Failed to write to temp file: wrote %d, exp %d, err=%v", n, len(contents), err)
 		}
 
 		oldContents := []byte{}
 		if fi, err := os.Stat(config.Dest); err == nil {
 			if err := dest.Chmod(fi.Mode()); err != nil {
-				log.Fatalf("unable to chmod temp file: %s\n", err)
+				log.Fatalf("Unable to chmod temp file: %s\n", err)
 			}
 			if err := dest.Chown(int(fi.Sys().(*syscall.Stat_t).Uid), int(fi.Sys().(*syscall.Stat_t).Gid)); err != nil {
-				log.Fatalf("unable to chown temp file: %s\n", err)
+				log.Fatalf("Unable to chown temp file: %s\n", err)
 			}
 			oldContents, err = ioutil.ReadFile(config.Dest)
 			if err != nil {
-				log.Fatalf("unable to compare current file contents: %s: %s\n", config.Dest, err)
+				log.Fatalf("Unable to compare current file contents: %s: %s\n", config.Dest, err)
 			}
 		}
 
 		if bytes.Compare(oldContents, contents) != 0 {
 			err = os.Rename(dest.Name(), config.Dest)
 			if err != nil {
-				log.Fatalf("unable to create dest file %s: %s\n", config.Dest, err)
+				log.Fatalf("Unable to create dest file %s: %s\n", config.Dest, err)
 			}
 			log.Printf("Generated '%s' from %d containers", config.Dest, len(filteredContainers))
 			return true
@@ -539,13 +539,13 @@ func GenerateFile(config Config, containers Context) bool {
 func executeTemplate(templatePath string, containers Context) []byte {
 	tmpl, err := newTemplate(filepath.Base(templatePath)).ParseFiles(templatePath)
 	if err != nil {
-		log.Fatalf("unable to parse template: %s", err)
+		log.Fatalf("Unable to parse template: %s", err)
 	}
 
 	buf := new(bytes.Buffer)
 	err = tmpl.ExecuteTemplate(buf, filepath.Base(templatePath), &containers)
 	if err != nil {
-		log.Fatalf("template error: %s\n", err)
+		log.Fatalf("Template error: %s\n", err)
 	}
 	return buf.Bytes()
 }