Skip to content

Commit 6b60233

Browse files
committed
Use log package
1 parent 62e61bf commit 6b60233

File tree

3 files changed

+20
-22
lines changed

3 files changed

+20
-22
lines changed

docker-gen.go

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"flag"
66
"fmt"
77
"io"
8+
"log"
89
"net"
910
"net/http"
1011
"net/http/httputil"
@@ -137,20 +138,20 @@ func getEvents() chan *Event {
137138

138139
c, err := newConn()
139140
if err != nil {
140-
fmt.Printf("cannot connect to docker: %s\n", err)
141+
log.Printf("cannot connect to docker: %s\n", err)
141142
return
142143
}
143144
defer c.Close()
144145

145146
req, err := http.NewRequest("GET", "/events", nil)
146147
if err != nil {
147-
fmt.Printf("bad request for events: %s\n", err)
148+
log.Printf("bad request for events: %s\n", err)
148149
return
149150
}
150151

151152
resp, err := c.Do(req)
152153
if err != nil {
153-
fmt.Printf("cannot connect to events endpoint: %s\n", err)
154+
log.Printf("cannot connect to events endpoint: %s\n", err)
154155
return
155156
}
156157
defer resp.Body.Close()
@@ -160,7 +161,7 @@ func getEvents() chan *Event {
160161
signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM, syscall.SIGQUIT)
161162
go func() {
162163
for sig := range sigChan {
163-
fmt.Printf("received signal '%v', exiting\n", sig)
164+
log.Printf("received signal '%v', exiting\n", sig)
164165

165166
c.Close()
166167
close(eventChan)
@@ -175,12 +176,12 @@ func getEvents() chan *Event {
175176
if err == io.EOF {
176177
break
177178
}
178-
fmt.Printf("cannot decode json: %s\n", err)
179+
log.Printf("cannot decode json: %s\n", err)
179180
goto restart
180181
}
181182
eventChan <- event
182183
}
183-
fmt.Printf("closing event channel\n")
184+
log.Printf("closing event channel\n")
184185
}()
185186
return eventChan
186187
}
@@ -197,7 +198,7 @@ func getContainers(client *docker.Client) ([]*RuntimeContainer, error) {
197198
for _, apiContainer := range apiContainers {
198199
container, err := client.InspectContainer(apiContainer.ID)
199200
if err != nil {
200-
fmt.Printf("error inspecting container: %s: %s\n", apiContainer.ID, err)
201+
log.Printf("error inspecting container: %s: %s\n", apiContainer.ID, err)
201202
continue
202203
}
203204

@@ -233,7 +234,7 @@ func getContainers(client *docker.Client) ([]*RuntimeContainer, error) {
233234
func generateFromContainers(client *docker.Client) {
234235
containers, err := getContainers(client)
235236
if err != nil {
236-
fmt.Printf("error listing containers: %s\n", err)
237+
log.Printf("error listing containers: %s\n", err)
237238
return
238239
}
239240
for _, config := range configs.Config {
@@ -253,7 +254,7 @@ func runNotifyCmd(config Config) {
253254
cmd := exec.Command(args[0], args[1:]...)
254255
out, err := cmd.CombinedOutput()
255256
if err != nil {
256-
fmt.Printf("error running notify command: %s, %s\n", config.NotifyCmd, err)
257+
log.Printf("error running notify command: %s, %s\n", config.NotifyCmd, err)
257258
fmt.Println(string(out))
258259
}
259260
}
@@ -284,7 +285,7 @@ func generateAtInterval(client *docker.Client, configs ConfigFile) {
284285
case <-ticker.C:
285286
containers, err := getContainers(client)
286287
if err != nil {
287-
fmt.Printf("error listing containers: %s\n", err)
288+
log.Printf("error listing containers: %s\n", err)
288289
continue
289290
}
290291
// ignore changed return value. always run notify command
@@ -334,7 +335,7 @@ func main() {
334335
if configFile != "" {
335336
err := loadConfig(configFile)
336337
if err != nil {
337-
fmt.Printf("error loading config %s: %s\n", configFile, err)
338+
log.Printf("error loading config %s: %s\n", configFile, err)
338339
os.Exit(1)
339340
}
340341
} else {

reflect.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

33
import (
4-
"fmt"
4+
"log"
55
"reflect"
66
"strings"
77
)
@@ -40,7 +40,7 @@ func deepGet(item interface{}, path string) interface{} {
4040
return deepGet(mapValue.Interface(), strings.Join(parts[1:], "."))
4141
}
4242
default:
43-
fmt.Printf("can't group by %s\n", path)
43+
log.Printf("can't group by %s\n", path)
4444
}
4545
return nil
4646
}

template.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package main
22

33
import (
44
"bytes"
5-
"fmt"
65
"io"
76
"io/ioutil"
7+
"log"
88
"os"
99
"path/filepath"
1010
"strings"
@@ -37,7 +37,7 @@ func generateFile(config Config, containers []*RuntimeContainer) bool {
3737
"split": strings.Split,
3838
}).ParseFiles(templatePath)
3939
if err != nil {
40-
panic(err)
40+
log.Fatalf("unable to parse template: %s", err)
4141
}
4242

4343
filteredContainers := []*RuntimeContainer{}
@@ -59,16 +59,15 @@ func generateFile(config Config, containers []*RuntimeContainer) bool {
5959
os.Remove(dest.Name())
6060
}()
6161
if err != nil {
62-
fmt.Printf("unable to create temp file: %s\n", err)
63-
os.Exit(1)
62+
log.Fatalf("unable to create temp file: %s\n", err)
6463
}
6564
}
6665

6766
var buf bytes.Buffer
6867
multiwriter := io.MultiWriter(dest, &buf)
6968
err = tmpl.ExecuteTemplate(multiwriter, filepath.Base(templatePath), containers)
7069
if err != nil {
71-
fmt.Printf("template error: %s\n", err)
70+
log.Fatalf("template error: %s\n", err)
7271
}
7372

7473
if config.Dest != "" {
@@ -77,16 +76,14 @@ func generateFile(config Config, containers []*RuntimeContainer) bool {
7776
if _, err := os.Stat(config.Dest); err == nil {
7877
contents, err = ioutil.ReadFile(config.Dest)
7978
if err != nil {
80-
fmt.Printf("unable to compare current file contents: %s: %s\n", config.Dest, err)
81-
os.Exit(1)
79+
log.Fatalf("unable to compare current file contents: %s: %s\n", config.Dest, err)
8280
}
8381
}
8482

8583
if bytes.Compare(contents, buf.Bytes()) != 0 {
8684
err = os.Rename(dest.Name(), config.Dest)
8785
if err != nil {
88-
fmt.Printf("unable to create dest file %s: %s\n", config.Dest, err)
89-
os.Exit(1)
86+
log.Fatalf("unable to create dest file %s: %s\n", config.Dest, err)
9087
}
9188
return true
9289
}

0 commit comments

Comments
 (0)