Skip to content

Commit 955ecc2

Browse files
author
mfarah
committed
Removed usage of log
1 parent 1d5fbd5 commit 955ecc2

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

data_navigator.go

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

33
import (
44
// "fmt"
5-
"log"
65
"strconv"
76
)
87

@@ -48,7 +47,7 @@ func recurse(value interface{}, head string, tail []string) interface{} {
4847
}
4948
index, err := strconv.ParseInt(head, 10, 64)
5049
if err != nil {
51-
log.Fatalf("Error accessing array: %v", err)
50+
die("Error accessing array: %v", err)
5251
}
5352
return readArray(value.([]interface{}), index, tail)
5453
case map[interface{}]interface{}:

yaml.go

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"github.com/spf13/cobra"
66
"gopkg.in/yaml.v2"
77
"io/ioutil"
8-
"log"
98
"os"
109
"strconv"
1110
"strings"
@@ -68,7 +67,7 @@ func readProperty(cmd *cobra.Command, args []string) {
6867

6968
func writeProperty(cmd *cobra.Command, args []string) {
7069
if len(args) < 3 {
71-
log.Fatalf("Must provide <filename> <path_to_update> <value>")
70+
die("Must provide <filename> <path_to_update> <value>")
7271
}
7372

7473
var parsedData map[interface{}]interface{}
@@ -108,7 +107,7 @@ func printYaml(context interface{}) {
108107
func yamlToString(context interface{}) string {
109108
out, err := yaml.Marshal(context)
110109
if err != nil {
111-
log.Fatalf("error printing yaml: %v", err)
110+
die("error printing yaml: %v", err)
112111
}
113112
outStr := string(out)
114113
// trim the trailing new line as it's easier for a script to add
@@ -121,7 +120,7 @@ func yamlToString(context interface{}) string {
121120

122121
func readYaml(args []string, parsedData *map[interface{}]interface{}) {
123122
if len(args) == 0 {
124-
log.Fatalf("Must provide filename")
123+
die("Must provide filename")
125124
}
126125

127126
var rawData []byte
@@ -133,22 +132,27 @@ func readYaml(args []string, parsedData *map[interface{}]interface{}) {
133132

134133
err := yaml.Unmarshal([]byte(rawData), &parsedData)
135134
if err != nil {
136-
log.Fatalf("error: %v", err)
135+
die("error: %v", err)
137136
}
138137
}
139138

140139
func readStdin() []byte {
141140
bytes, err := ioutil.ReadAll(os.Stdin)
142141
if err != nil {
143-
log.Fatalf("error reading stdin", err)
142+
die("error reading stdin", err)
144143
}
145144
return bytes
146145
}
147146

148147
func readFile(filename string) []byte {
149148
var rawData, readError = ioutil.ReadFile(filename)
150149
if readError != nil {
151-
log.Fatalf("error: %v", readError)
150+
die("error: %v", readError)
152151
}
153152
return rawData
154153
}
154+
155+
func die(message ...interface{}) {
156+
fmt.Println(message)
157+
os.Exit(1)
158+
}

0 commit comments

Comments
 (0)