Skip to content

Commit 50a352d

Browse files
glintonglinton
committed
Specify type when printing output
1 parent 55d36bd commit 50a352d

29 files changed

+415
-413
lines changed

‎api/api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func parseBody(req *http.Request, v interface{}) error {
164164
// read the body
165165
b, err := ioutil.ReadAll(req.Body)
166166
if err != nil {
167-
config.Log.Error(err.Error())
167+
config.Log.Error("Failed to read body - %s", err)
168168
return BodyReadFail
169169
}
170170
defer req.Body.Close()

‎api/api_test.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ func TestPostCert(t *testing.T) {
499499
var cert core.CertBundle
500500
err = json.Unmarshal(resp, &cert)
501501
if err != nil {
502-
t.Errorf("Failed to POST cert - %v", err)
502+
t.Errorf("Failed to POST cert - %s", err)
503503
}
504504
// bad request test
505505
resp, err = rest("POST", "/certs", "[{\"key\":\"test.comma\", \"cert\": 1}]")
@@ -547,7 +547,7 @@ func rest(method, route, data string) ([]byte, error) {
547547

548548
res, err := http.DefaultClient.Do(req)
549549
if err != nil {
550-
return nil, fmt.Errorf("Unable to %v %v - %v", method, route, err)
550+
return nil, fmt.Errorf("Unable to %s %s - %s", method, route, err)
551551
}
552552
defer res.Body.Close()
553553

@@ -568,37 +568,37 @@ func initialize() {
568568
config.RouteTls = "0.0.0.0:9443"
569569
config.Log = lumber.NewConsoleLogger(lumber.LvlInt("FATAL"))
570570
config.LogLevel = "FATAL"
571-
apiAddr = fmt.Sprintf("%v:%v", config.ApiHost, config.ApiPort)
571+
apiAddr = fmt.Sprintf("%s:%s", config.ApiHost, config.ApiPort)
572572

573573
// initialize database
574574
err := database.Init()
575575
if err != nil {
576-
fmt.Printf("Database init failed - %v\n", err)
576+
fmt.Printf("Database init failed - %s\n", err)
577577
os.Exit(1)
578578
}
579579
// initialize balancer
580580
balance.Balancer = &database.ScribbleDatabase{}
581581
err = balance.Balancer.Init()
582582
if err != nil {
583-
fmt.Printf("Balancer init failed - %v\n", err)
583+
fmt.Printf("Balancer init failed - %s\n", err)
584584
os.Exit(1)
585585
}
586586
// initialize proxymgr
587587
err = proxymgr.Init()
588588
if err != nil {
589-
fmt.Printf("Proxymgr init failed - %v\n", err)
589+
fmt.Printf("Proxymgr init failed - %s\n", err)
590590
os.Exit(1)
591591
}
592592
// initialize vipmgr
593593
err = vipmgr.Init()
594594
if err != nil {
595-
fmt.Printf("Vipmgr init failed - %v\n", err)
595+
fmt.Printf("Vipmgr init failed - %s\n", err)
596596
os.Exit(1)
597597
}
598598
// initialize clusterer
599599
err = cluster.Init()
600600
if err != nil {
601-
fmt.Printf("Clusterer init failed - %v\n", err)
601+
fmt.Printf("Clusterer init failed - %s\n", err)
602602
os.Exit(1)
603603
}
604604
// load saved rules
@@ -607,14 +607,14 @@ func initialize() {
607607
// if error is not about a missing db, continue
608608
if !strings.Contains(err.Error(), "Found") {
609609
// todo: this requires backends to return NoServiceError in GetServices
610-
fmt.Printf("Get services from backend failed - %v\n", err)
610+
fmt.Printf("Get services from backend failed - %s\n", err)
611611
os.Exit(1)
612612
}
613613
}
614614
// apply saved rules
615615
err = balance.Balancer.SetServices(services)
616616
if err != nil {
617-
fmt.Printf("Balancer sync failed - %v\n", err)
617+
fmt.Printf("Balancer sync failed - %s\n", err)
618618
os.Exit(1)
619619
}
620620
}

‎api/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
func parseReqServer(req *http.Request) (*core.Server, error) {
1515
b, err := ioutil.ReadAll(req.Body)
1616
if err != nil {
17-
config.Log.Error(err.Error())
17+
config.Log.Error("Failed to read body - %s", err)
1818
return nil, BodyReadFail
1919
}
2020

‎api/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
func parseReqService(req *http.Request) (*core.Service, error) {
1717
b, err := ioutil.ReadAll(req.Body)
1818
if err != nil {
19-
config.Log.Error(err.Error())
19+
config.Log.Error("Failed to read body - %s", err)
2020
return nil, BodyReadFail
2121
}
2222

‎balance/balance.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func Init() error {
4646
}
4747
// don't break if we can't use iptables
4848
if _, err = tab.List("filter", "INPUT"); err != nil {
49-
config.Log.Error("Could not use iptables, continuing without - %v", err)
49+
config.Log.Error("Could not use iptables, continuing without - %s", err)
5050
tab = nil
5151
}
5252
if tab != nil {
@@ -55,15 +55,15 @@ func Init() error {
5555
tab.DeleteChain("filter", "portal")
5656
err = tab.NewChain("filter", "portal")
5757
if err != nil {
58-
return fmt.Errorf("Failed to create new chain - %v", err)
58+
return fmt.Errorf("Failed to create new chain - %s", err)
5959
}
6060
err = tab.AppendUnique("filter", "portal", "-j", "RETURN")
6161
if err != nil {
62-
return fmt.Errorf("Failed to append to portal chain - %v", err)
62+
return fmt.Errorf("Failed to append to portal chain - %s", err)
6363
}
6464
err = tab.AppendUnique("filter", "INPUT", "-j", "portal")
6565
if err != nil {
66-
return fmt.Errorf("Failed to append to INPUT chain - %v", err)
66+
return fmt.Errorf("Failed to append to INPUT chain - %s", err)
6767
}
6868

6969
// Allow router through by default (ports 80/443)
@@ -110,7 +110,7 @@ func SetServices(services []core.Service) error {
110110
tab.ClearChain("filter", "portal")
111111
tab.DeleteChain("filter", "portal")
112112
tab.RenameChain("filter", "portal-old", "portal")
113-
return fmt.Errorf("Failed to tab.Insert() - %v", err.Error())
113+
return fmt.Errorf("Failed to tab.Insert() - %s", err)
114114
}
115115

116116
tab.NewChain("filter", "portal")

‎balance/lvs.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,12 @@ func (l *Lvs) SetServers(svcId string, servers []core.Server) error {
129129

130130
for _, isrv := range s.Servers {
131131
if err = s.RemoveServer(isrv.Host, isrv.Port); err != nil {
132-
return fmt.Errorf("[ipvsadm] Failed to remove server - %v:%v; %v", isrv.Host, isrv.Port, err.Error())
132+
return fmt.Errorf("[ipvsadm] Failed to remove server - %s:%d; %s", isrv.Host, isrv.Port, err)
133133
}
134134
}
135135
for _, lsrv := range lvsServers {
136136
if err = s.AddServer(lsrv); err != nil {
137-
return fmt.Errorf("[ipvsadm] Failed to add server - %v:%v; %v", lsrv.Host, lsrv.Port, err.Error())
137+
return fmt.Errorf("[ipvsadm] Failed to add server - %s:%d; %s", lsrv.Host, lsrv.Port, err)
138138
}
139139
}
140140
return nil
@@ -235,11 +235,11 @@ func (l *Lvs) SetServices(services []core.Service) error {
235235

236236
err := lvs.Clear()
237237
if err != nil {
238-
return fmt.Errorf("Failed to lvs.Clear() - %v", err.Error())
238+
return fmt.Errorf("Failed to lvs.Clear() - %s", err)
239239
}
240240
err = lvs.Restore(lvsServices)
241241
if err != nil {
242-
return fmt.Errorf("Failed to lvs.Restore() - %v", err.Error())
242+
return fmt.Errorf("Failed to lvs.Restore() - %s", err)
243243
}
244244
return nil
245245
}
@@ -260,7 +260,7 @@ func Sync() error {
260260
// if tab != nil {
261261
// tab.RenameChain("filter", "portal-old", "portal")
262262
// }
263-
return fmt.Errorf("Failed to lvs.Save() - %v", err.Error())
263+
return fmt.Errorf("Failed to lvs.Save() - %s", err)
264264
}
265265

266266
// lvsServices := lvs.DefaultIpvs.Services
@@ -275,7 +275,7 @@ func Sync() error {
275275
// tab.ClearChain("filter", "portal")
276276
// tab.DeleteChain("filter", "portal")
277277
// tab.RenameChain("filter", "portal-old", "portal")
278-
// return fmt.Errorf("Failed to tab.Insert() - %v", err.Error())
278+
// return fmt.Errorf("Failed to tab.Insert() - %s", err)
279279
// }
280280
// }
281281
// tab.AppendUnique("filter", "INPUT", "-j", "portal")

‎balance/lvs_test.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestSetService(t *testing.T) {
4242
t.SkipNow()
4343
}
4444
if err := balance.SetService(&testService1); err != nil {
45-
t.Errorf("Failed to SET service - %v", err)
45+
t.Errorf("Failed to SET service - %s", err)
4646
t.FailNow()
4747
}
4848

@@ -65,12 +65,12 @@ func TestSetServices(t *testing.T) {
6565
services = append(services, testService2)
6666

6767
if err := balance.SetServices(services); err != nil {
68-
t.Errorf("Failed to SET services - %v", err)
68+
t.Errorf("Failed to SET services - %s", err)
6969
t.FailNow()
7070
}
7171

7272
if _, err := os.Stat("/tmp/scribbleTest/services/tcp-192_168_0_15-80.json"); !os.IsNotExist(err) {
73-
t.Errorf("Failed to clear old services on PUT - %v", err)
73+
t.Errorf("Failed to clear old services on PUT - %s", err)
7474
}
7575

7676
// todo: read from ipvsadm
@@ -90,7 +90,7 @@ func TestGetServices(t *testing.T) {
9090
}
9191
services, err := balance.GetServices()
9292
if err != nil {
93-
t.Errorf("Failed to GET services - %v", err)
93+
t.Errorf("Failed to GET services - %s", err)
9494
t.FailNow()
9595
}
9696

@@ -105,7 +105,7 @@ func TestGetService(t *testing.T) {
105105
}
106106
service, err := balance.GetService(testService2.Id)
107107
if err != nil {
108-
t.Errorf("Failed to GET service - %v", err)
108+
t.Errorf("Failed to GET service - %s", err)
109109
t.FailNow()
110110
}
111111

@@ -119,7 +119,7 @@ func TestDeleteService(t *testing.T) {
119119
t.SkipNow()
120120
}
121121
if err := balance.DeleteService(testService2.Id); err != nil {
122-
t.Errorf("Failed to GET service - %v", err)
122+
t.Errorf("Failed to GET service - %s", err)
123123
}
124124

125125
// todo: read from ipvsadm
@@ -138,7 +138,7 @@ func TestSetServer(t *testing.T) {
138138
}
139139
balance.SetService(&testService1)
140140
if err := balance.SetServer(testService1.Id, &testServer1); err != nil {
141-
t.Errorf("Failed to SET server - %v", err)
141+
t.Errorf("Failed to SET server - %s", err)
142142
t.FailNow()
143143
}
144144

@@ -163,7 +163,7 @@ func TestSetServers(t *testing.T) {
163163
servers := []core.Server{}
164164
servers = append(servers, testServer2)
165165
if err := balance.SetServers(testService1.Id, servers); err != nil {
166-
t.Errorf("Failed to SET servers - %v", err)
166+
t.Errorf("Failed to SET servers - %s", err)
167167
t.FailNow()
168168
}
169169

@@ -187,7 +187,7 @@ func TestGetServers(t *testing.T) {
187187
}
188188
service, err := balance.GetService(testService1.Id)
189189
if err != nil {
190-
t.Errorf("Failed to GET service - %v", err)
190+
t.Errorf("Failed to GET service - %s", err)
191191
t.FailNow()
192192
}
193193

@@ -202,7 +202,7 @@ func TestGetServer(t *testing.T) {
202202
}
203203
server, err := balance.GetServer(testService1.Id, testServer2.Id)
204204
if err != nil {
205-
t.Errorf("Failed to GET server - %v", err)
205+
t.Errorf("Failed to GET server - %s", err)
206206
t.FailNow()
207207
}
208208

@@ -217,7 +217,7 @@ func TestDeleteServer(t *testing.T) {
217217
}
218218
err := balance.DeleteServer(testService1.Id, testServer2.Id)
219219
if err != nil {
220-
t.Errorf("Failed to DELETE server - %v", err)
220+
t.Errorf("Failed to DELETE server - %s", err)
221221
}
222222

223223
// todo: read from ipvsadm
@@ -246,12 +246,12 @@ func toJson(v interface{}) ([]byte, error) {
246246
func initialize() {
247247
ifIptables, err := exec.Command("iptables", "-S").CombinedOutput()
248248
if err != nil {
249-
fmt.Printf("Failed to run iptables - %s%v\n", ifIptables, err.Error())
249+
fmt.Printf("Failed to run iptables - %s%s\n", ifIptables, err)
250250
skip = true
251251
}
252252
ifIpvsadm, err := exec.Command("ipvsadm", "--version").CombinedOutput()
253253
if err != nil {
254-
fmt.Printf("Failed to run ipvsadm - %s%v\n", ifIpvsadm, err.Error())
254+
fmt.Printf("Failed to run ipvsadm - %s%s\n", ifIpvsadm, err)
255255
skip = true
256256
}
257257

@@ -261,12 +261,12 @@ func initialize() {
261261
// todo: find more friendly way to clear crufty rules only
262262
err = exec.Command("iptables", "-F", "portal").Run()
263263
if err != nil {
264-
fmt.Printf("Failed to clear iptables - %v\n", err.Error())
264+
fmt.Printf("Failed to clear iptables - %s\n", err)
265265
os.Exit(1)
266266
}
267267
err = exec.Command("ipvsadm", "-C").Run()
268268
if err != nil {
269-
fmt.Printf("Failed to clear ipvsadm - %v\n", err.Error())
269+
fmt.Printf("Failed to clear ipvsadm - %s\n", err)
270270
os.Exit(1)
271271
}
272272

‎balance/nginx.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func (n *Nginx) Init() error {
3131
// ensure config location exists
3232
err := os.MkdirAll(config.WorkDir, 0755)
3333
if err != nil {
34-
return fmt.Errorf("Failed to create working directory - %v", err)
34+
return fmt.Errorf("Failed to create working directory - %s", err)
3535
}
3636
n.configFile = path.Join(config.WorkDir, "portal-nginx.conf")
3737
primerConfig := path.Join(config.WorkDir, "portal-nginx-primer.conf")
@@ -42,13 +42,13 @@ func (n *Nginx) Init() error {
4242
// read config file and save as primer (first run generally)
4343
cfg, err = ioutil.ReadFile(n.configFile)
4444
if err != nil {
45-
return fmt.Errorf("Failed to read a config file - %v", err)
45+
return fmt.Errorf("Failed to read a config file - %s", err)
4646
}
4747

4848
// persist primer config
4949
err = ioutil.WriteFile(primerConfig, cfg, 0644)
5050
if err != nil {
51-
return fmt.Errorf("Failed to write primer config - %v", err)
51+
return fmt.Errorf("Failed to write primer config - %s", err)
5252
}
5353
}
5454

@@ -288,13 +288,13 @@ stream {
288288
cfgFile, err := os.Create(n.configFile)
289289
defer cfgFile.Close()
290290
if err != nil {
291-
return fmt.Errorf("Failed to create config file - %v", err)
291+
return fmt.Errorf("Failed to create config file - %s", err)
292292
}
293293

294294
// execute the template
295295
err = t.ExecuteTemplate(cfgFile, "nginxConfig", n.Services)
296296
if err != nil {
297-
return fmt.Errorf("Failed to generate config file - %v", err)
297+
return fmt.Errorf("Failed to generate config file - %s", err)
298298
}
299299

300300
// reload nginx

0 commit comments

Comments
 (0)