Skip to content

Commit 4fea784

Browse files
AlCutterAlCutter
committed
Tweaks
1 parent 227df4c commit 4fea784

File tree

18 files changed

+46
-52
lines changed

18 files changed

+46
-52
lines changed

‎fixchain/chainfix/chainfix.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func processChains(file string, fl *fixchain.FixAndLog) {
4242
}
4343
defer func() {
4444
if err := f.Close(); err != nil {
45-
log.Fatalf("Can't close file: %v\n", err)
45+
log.Fatalf("Can't close file: %v", err)
4646
}
4747
}()
4848

@@ -90,7 +90,7 @@ func contentStore(baseDir string, subDir string, content []byte) {
9090
}
9191
defer func() {
9292
if err := f.Close(); err != nil {
93-
log.Fatalf("Can't close file: %v\n", err)
93+
log.Fatalf("Can't close file: %v", err)
9494
}
9595
}()
9696
if _, err := f.Write(content); err != nil {

‎fixchain/roundtrip_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ func (rt postTestRoundTripper) RoundTrip(request *http.Request) (*http.Response,
211211
rt.t.Error(errStr)
212212
return nil, errors.New(errStr)
213213
}
214-
214+
215215
if err != nil {
216216
errStr := fmt.Sprintf("#%d: Could not read request body: %s", rt.testIndex, err.Error())
217217
rt.t.Error(errStr)

‎fixchain/url_cache.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ package fixchain
1717
import (
1818
"fmt"
1919
"io"
20-
"log"
2120
"net/http"
2221
"sync"
2322
"sync/atomic"
2423
"time"
24+
25+
"k8s.io/klog/v2"
2526
)
2627

2728
type lockedCache struct {
@@ -68,9 +69,9 @@ func (u *urlCache) getURL(url string) ([]byte, error) {
6869
atomic.AddUint32(&u.errors, 1)
6970
return nil, err
7071
}
71-
defer func(){
72+
defer func() {
7273
if err := c.Body.Close(); err != nil {
73-
log.Fatalf("Operation to close response body failed: %v\n", err)
74+
klog.Errorf("Operation to close response body failed: %v", err)
7475
}
7576
}()
7677
// TODO(katjoyce): Add caching of permanent errors.
@@ -95,7 +96,7 @@ func newURLCache(c *http.Client, logStats bool) *urlCache {
9596
t := time.NewTicker(time.Second)
9697
go func() {
9798
for range t.C {
98-
log.Printf("url cache: %d hits, %d misses, %d errors, "+
99+
klog.Infof("url cache: %d hits, %d misses, %d errors, "+
99100
"%d bad status, %d read fail, %d cached", u.hit,
100101
u.miss, u.errors, u.badStatus, u.readFail,
101102
len(u.cache.m))

‎internal/witness/client/http/witness_client.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ import (
2222
"errors"
2323
"fmt"
2424
"io"
25-
"log"
2625
"net/http"
2726
"net/url"
2827
"os"
2928

3029
wit_api "github.com/google/certificate-transparency-go/internal/witness/api"
30+
"k8s.io/klog/v2"
3131
)
3232

3333
// ErrSTHTooOld is returned if the STH passed to Update needs to be updated.
@@ -54,7 +54,7 @@ func (w Witness) GetLatestSTH(ctx context.Context, logID string) ([]byte, error)
5454
}
5555
defer func() {
5656
if err := resp.Body.Close(); err != nil {
57-
log.Fatalf("Failed to close response body: %v\n", err)
57+
klog.Errorf("Failed to close response body: %v", err)
5858
}
5959
}()
6060
if resp.StatusCode == 404 {
@@ -94,7 +94,7 @@ func (w Witness) Update(ctx context.Context, logID string, sth []byte, proof [][
9494
}
9595
defer func() {
9696
if err := resp.Body.Close(); err != nil {
97-
log.Fatalf("Failed to close response body: %v\n", err)
97+
klog.Errorf("Failed to close response body: %v", err)
9898
}
9999
}()
100100
body, err := io.ReadAll(resp.Body)

‎internal/witness/cmd/client/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ func readHTTP(u *url.URL) ([]byte, error) {
218218
}
219219
defer func() {
220220
if err := resp.Body.Close(); err != nil {
221-
klog.Exitf("failed to close response body %v\n", err)
221+
klog.Errorf("failed to close response body %v", err)
222222
}
223223
}()
224224
return io.ReadAll(resp.Body)

‎internal/witness/cmd/feeder/main.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"flag"
2525
"fmt"
2626
"io"
27-
"log"
2827
"net/http"
2928
"net/url"
3029
"os"
@@ -261,7 +260,7 @@ func readHTTP(u *url.URL) ([]byte, error) {
261260
}
262261
defer func() {
263262
if err := resp.Body.Close(); err != nil {
264-
log.Fatalf("Failed to close response body: %v\n", err)
263+
klog.Errorf("Failed to close response body: %v", err)
265264
}
266265
}()
267266
return io.ReadAll(resp.Body)

‎internal/witness/cmd/witness/config/config.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"flag"
2121
"fmt"
2222
"io"
23-
"log"
2423
"net/http"
2524
"net/url"
2625
"os"
@@ -87,7 +86,7 @@ func readHTTP(u *url.URL) ([]byte, error) {
8786
}
8887
defer func() {
8988
if err := resp.Body.Close(); err != nil {
90-
log.Fatalf("Operation to close response body failed: %v\n", err)
89+
klog.Errorf("Operation to close response body failed: %v", err)
9190
}
9291
}()
9392
return io.ReadAll(resp.Body)

‎internal/witness/cmd/witness/internal/witness/witness.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"encoding/pem"
2828
"errors"
2929
"fmt"
30-
"log"
3130
"reflect"
3231

3332
ct "github.com/google/certificate-transparency-go"
@@ -120,9 +119,9 @@ func (w *Witness) GetLogs() ([]string, error) {
120119
if err != nil {
121120
return nil, err
122121
}
123-
defer func(){
122+
defer func() {
124123
if err := rows.Close(); err != nil {
125-
log.Fatalf("Operation to close rows failed: %v\n", err)
124+
klog.Errorf("Operation to close rows failed: %v", err)
126125
}
127126
}()
128127
var logs []string

‎jsonclient/client_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ func MockServer(t *testing.T, failCount int, retryAfter int) *httptest.Server {
145145
decoder := json.NewDecoder(r.Body)
146146
err := decoder.Decode(&s)
147147
if err != nil {
148-
panic("Failed to decode: " + err.Error())
148+
t.Fatalf("Failed to decode: " + err.Error())
149149
}
150150
defer func() {
151151
if err := r.Body.Close(); err != nil {
152-
panic("Failed to close request body: " + err.Error())
152+
t.Fatalf("Failed to close request body: " + err.Error())
153153
}
154154
}()
155155
}
@@ -162,11 +162,11 @@ func MockServer(t *testing.T, failCount int, retryAfter int) *httptest.Server {
162162
decoder := json.NewDecoder(r.Body)
163163
err := decoder.Decode(&params)
164164
if err != nil {
165-
panic("Failed to decode: " + err.Error())
165+
t.Fatalf("Failed to decode: " + err.Error())
166166
}
167167
defer func() {
168168
if err := r.Body.Close(); err != nil {
169-
panic("Failed to close request body: " + err.Error())
169+
t.Fatalf("Failed to close request body: " + err.Error())
170170
}
171171
}()
172172
}

‎submission/loglist_manager_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func TestFirstRefresh(t *testing.T) {
5454
}
5555
defer func() {
5656
if err := os.Remove(f); err != nil {
57-
t.Fatalf("Operation to remove temp file failed: %v\n", err)
57+
t.Fatalf("Operation to remove temp file failed: %v", err)
5858
}
5959
}()
6060

@@ -81,7 +81,7 @@ func TestSecondRefresh(t *testing.T) {
8181
}
8282
defer func() {
8383
if err := os.Remove(f); err != nil {
84-
t.Fatalf("Operation to remove temp file failed: %v\n", err)
84+
t.Fatalf("Operation to remove temp file failed: %v", err)
8585
}
8686
}()
8787

‎submission/loglist_refresher_test.go

+5-8
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,14 @@ func createTempFile(data string) (string, error) {
3737
if err != nil {
3838
return "", err
3939
}
40-
defer func(){
40+
defer func() {
4141
if err := f.Close(); err != nil {
42-
log.Fatalf("Operation to close file failed: %v\n", err)
42+
log.Fatalf("Operation to close file failed: %v", err)
4343
}
4444
}()
4545
if _, err := f.WriteString(data); err != nil {
4646
return "", err
4747
}
48-
// if err := f.Close(); err != nil {
49-
// return "", err
50-
// }
5148
return f.Name(), nil
5249
}
5350

@@ -61,7 +58,7 @@ func ExampleLogListRefresher() {
6158
}
6259
defer func() {
6360
if err := os.Remove(f); err != nil {
64-
log.Fatalf("Operation to remove temp file failed: %v\n", err)
61+
log.Fatalf("Operation to remove temp file failed: %v", err)
6562
}
6663
}()
6764

@@ -148,7 +145,7 @@ func TestNewLogListRefresher(t *testing.T) {
148145
}
149146
defer func() {
150147
if err := os.Remove(f); err != nil {
151-
log.Fatalf("Operation to remove temp file failed: %v\n", err)
148+
t.Fatalf("Operation to remove temp file failed: %v", err)
152149
}
153150
}()
154151

@@ -218,7 +215,7 @@ func TestNewLogListRefresherUpdate(t *testing.T) {
218215
}
219216
defer func() {
220217
if err := os.Remove(f); err != nil {
221-
log.Fatalf("Operation to remove temp file failed: %v\n", err)
218+
t.Fatalf("Operation to remove temp file failed: %v", err)
222219
}
223220
}()
224221

‎submission/proxy_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func TestProxyInitState(t *testing.T) {
9898
}
9999
defer func() {
100100
if err := os.Remove(f); err != nil {
101-
t.Fatalf("Operation to remove temp file failed: %v\n", err)
101+
t.Fatalf("Operation to remove temp file failed: %v", err)
102102
}
103103
}()
104104

‎trillian/ctfe/ct_server/main.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@ func main() {
112112
}
113113

114114
if err != nil {
115-
klog.Errorf("Failed to read config: %v", err)
115+
klog.Exitf("Failed to read config: %v", err)
116116
}
117117

118118
beMap, err := ctfe.ValidateLogMultiConfig(cfg)
119119
if err != nil {
120-
klog.Errorf("Invalid config: %v", err)
120+
klog.Exitf("Invalid config: %v", err)
121121
}
122122

123123
klog.CopyStandardLogTo("WARNING")
@@ -134,16 +134,16 @@ func main() {
134134
cfg := clientv3.Config{Endpoints: strings.Split(*etcdServers, ","), DialTimeout: 5 * time.Second}
135135
client, err := clientv3.New(cfg)
136136
if err != nil {
137-
klog.Errorf("Failed to connect to etcd at %v: %v", *etcdServers, err)
137+
klog.Exitf("Failed to connect to etcd at %v: %v", *etcdServers, err)
138138
}
139139

140140
httpManager, err := endpoints.NewManager(client, *etcdHTTPService)
141141
if err != nil {
142-
klog.Errorf("Failed to create etcd http manager: %v", err)
142+
klog.Exitf("Failed to create etcd http manager: %v", err)
143143
}
144144
metricsManager, err := endpoints.NewManager(client, *etcdMetricsService)
145145
if err != nil {
146-
klog.Errorf("Failed to create etcd metrics manager: %v", err)
146+
klog.Exitf("Failed to create etcd metrics manager: %v", err)
147147
}
148148

149149
etcdHTTPKey := fmt.Sprintf("%s/%s", *etcdHTTPService, *httpEndpoint)
@@ -197,13 +197,13 @@ func main() {
197197
}
198198
conn, err := grpc.Dial(be.BackendSpec, dialOpts...)
199199
if err != nil {
200-
klog.Errorf("Could not dial RPC server: %v: %v", be, err)
200+
klog.Exitf("Could not dial RPC server: %v: %v", be, err)
201201
}
202-
defer func(){
202+
defer func() {
203203
if err := conn.Close(); err != nil {
204204
klog.Errorf("Could not close RPC connection: %v", err)
205205
}
206-
}()
206+
}()
207207
clientMap[be.Name] = trillian.NewTrillianLogClient(conn)
208208
}
209209

@@ -220,7 +220,7 @@ func main() {
220220
for _, c := range cfg.LogConfigs.Config {
221221
inst, err := setupAndRegister(ctx, clientMap[c.LogBackendName], *rpcDeadline, c, corsMux, *handlerPrefix, *maskInternalErrors)
222222
if err != nil {
223-
klog.Errorf("Failed to set up log instance for %+v: %v", cfg, err)
223+
klog.Exitf("Failed to set up log instance for %+v: %v", cfg, err)
224224
}
225225
if *getSTHInterval > 0 {
226226
go inst.RunUpdateSTH(ctx, *getSTHInterval)
@@ -285,7 +285,7 @@ func main() {
285285
if *tracing {
286286
handler, err = opencensus.EnableHTTPServerTracing(*tracingProjectID, *tracingPercent)
287287
if err != nil {
288-
klog.Errorf("Failed to initialize stackdriver / opencensus tracing: %v", err)
288+
klog.Exitf("Failed to initialize stackdriver / opencensus tracing: %v", err)
289289
}
290290
}
291291

‎trillian/integration/ct_hammer/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ func main() {
257257
klog.Exitf("Failed to print banner!")
258258
}
259259
if err := r.Close(); err != nil {
260-
klog.Exitf("Failed to close reader %v\n", err)
260+
klog.Exitf("Failed to close reader %v", err)
261261
}
262262
fmt.Print("\n\nHammer Time\n\n")
263263
}

‎trillian/integration/ct_integration.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"crypto/sha256"
2626
"encoding/pem"
2727
"fmt"
28-
"log"
2928
"math/rand"
3029
"net"
3130
"net/http"
@@ -914,7 +913,7 @@ func (ls *logStats) fromServer(ctx context.Context, servers string) (*logStats,
914913
}
915914
defer func() {
916915
if err := httpRsp.Body.Close(); err != nil {
917-
log.Fatalf("Operation to close http response body failed: %v\n", err)
916+
fmt.Printf("Operation to close http response body failed: %v\n", err)
918917
}
919918
}()
920919

@@ -988,9 +987,9 @@ func setTreeState(ctx context.Context, adminServer string, logID int64, state tr
988987
if err != nil {
989988
return err
990989
}
991-
defer func(){
990+
defer func() {
992991
if err := conn.Close(); err != nil {
993-
log.Fatalf("Operation to close RPC connection failed: %v\n", err)
992+
fmt.Printf("Operation to close RPC connection failed: %v\n", err)
994993
}
995994
}()
996995

‎trillian/integration/hammer_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,12 @@ func (s *fakeCTServer) addChain(w http.ResponseWriter, req *http.Request) {
222222
func (s *fakeCTServer) close() {
223223
if s.server != nil {
224224
if err := s.server.Close(); err != nil {
225-
klog.Errorf("Operation to close server failed: %v\n", err)
225+
klog.Errorf("Operation to close server failed: %v", err)
226226
}
227227
}
228228
if s.lis != nil {
229229
if err := s.lis.Close(); err != nil {
230-
klog.Errorf("Operation to close server listener failed: %v\n", err)
230+
klog.Errorf("Operation to close server listener failed: %v", err)
231231
}
232232
}
233233
}

‎trillian/integration/logenv.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func NewCTLogEnv(ctx context.Context, cfgs []*configpb.LogConfig, numSequencers
115115
// Close shuts down the servers.
116116
func (env *CTLogEnv) Close() {
117117
if err := env.ctListener.Close(); err != nil {
118-
log.Fatalf("Operation to close listener failed: %v\n", err)
118+
log.Fatalf("Operation to close listener failed: %v", err)
119119
}
120120
env.wg.Wait()
121121
env.logEnv.Close()

‎trillian/migrillian/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func main() {
8484

8585
defer func() {
8686
if err := conn.Close(); err != nil {
87-
klog.Exitf("Could not close RPC connection: %v\n", err)
87+
klog.Errorf("Could not close RPC connection: %v", err)
8888
}
8989
}()
9090

0 commit comments

Comments
 (0)