Author: Adam Evyčędo <git@apiote.xyz>
fix end-of-lines in log messages
file/file.go | 8 ++++---- server/router.go | 2 +- traffic/access.go | 16 ++++++++-------- traffic/convert.go | 6 +++--- traffic/realtime_gtfs.go | 6 +++---
diff --git a/file/file.go b/file/file.go index 020b851b21f27bcf81f7148f4a02aad27da60c71..3f1d207c296933a220ef8901d1132321acd83a39 100644 --- a/file/file.go +++ b/file/file.go @@ -127,25 +127,25 @@ func MoveTraffic(srcName, dstName, path, feedHome string) error { inputFile, err := os.Open(filepath.Join(path, strings.Replace(srcName, ".zip", ".txz", -1))) if err != nil { - log.Printf("Couldn't open source file: %s", err) + log.Printf("Couldn't open source file: %s\n", err) return err } outputFile, err := os.Create(filepath.Join(feedHome, dstName)) if err != nil { inputFile.Close() - log.Printf("Couldn't open dest file: %s", err) + log.Printf("Couldn't open dest file: %s\n", err) return err } defer outputFile.Close() _, err = io.Copy(outputFile, inputFile) inputFile.Close() if err != nil { - log.Printf("Writing to output file failed: %s", err) + log.Printf("Writing to output file failed: %s\n", err) return err } err = os.Remove(filepath.Join(path, strings.Replace(srcName, ".zip", ".txz", -1))) if err != nil { - log.Printf("Failed removing original file: %s", err) + log.Printf("Failed removing original file: %s\n", err) return err } return nil diff --git a/server/router.go b/server/router.go index e6f78b453103d9f1415688a01ec1ae673c52be00..9058f7ebf449d35c7fcb6340a88d8f7a170f359b 100644 --- a/server/router.go +++ b/server/router.go @@ -614,7 +614,7 @@ go func() { fmt.Println("The wheels on the bus go round and round") if err := srv.ListenAndServe(); err != http.ErrServerClosed { - log.Printf("ListenAndServe(): %v", err) + log.Printf("ListenAndServe(): %v\n", err) os.Exit(1) } }() diff --git a/traffic/access.go b/traffic/access.go index ef323d27334dddd69f504aa179ae8adbfcffe8d2..d5b1dc1c05efbb386a42de0ef572a7b88c2c532b 100644 --- a/traffic/access.go +++ b/traffic/access.go @@ -367,23 +367,23 @@ ix := CodeIndex{} ixFile, err := os.Open(filepath.Join(timetableHome, "ix_stop_codes.bare")) if err != nil { - return ix, fmt.Errorf("while opening file: %w\n", err) + return ix, fmt.Errorf("while opening file: %w", err) } defer ixFile.Close() r := bare.NewReader(ixFile) num, err := r.ReadUint() if err != nil { - return ix, fmt.Errorf("while reading length: %w\n", err) + return ix, fmt.Errorf("while reading length: %w", err) } for i := uint64(0); i < num; i++ { k, err := r.ReadString() if err != nil { - return ix, fmt.Errorf("while reading key at %d: %w\n", i, err) + return ix, fmt.Errorf("while reading key at %d: %w", i, err) } v, err := r.ReadUint() if err != nil { - return ix, fmt.Errorf("while reading value at %d: %w\n", i, err) + return ix, fmt.Errorf("while reading value at %d: %w", i, err) } ix[k] = uint(v) } @@ -439,22 +439,22 @@ timetableHome := filepath.Join(feedHome, string(validity)) cIx, err := unmarshalCodeIndex(timetableHome) if err != nil { return codeIndex, nameIndex, lineIndex, tripIndex, - fmt.Errorf("while unmarshalling code index: %w\n", err) + fmt.Errorf("while unmarshalling code index: %w", err) } nIx, err := unmarshalStopNameIndex(timetableHome) if err != nil { return codeIndex, nameIndex, lineIndex, tripIndex, - fmt.Errorf("while unmarshalling name index: %w\n", err) + fmt.Errorf("while unmarshalling name index: %w", err) } lIx, err := unmarshalLineIndex(timetableHome) if err != nil { return codeIndex, nameIndex, lineIndex, tripIndex, - fmt.Errorf("while unmarshalling line index: %w\n", err) + fmt.Errorf("while unmarshalling line index: %w", err) } tIx, err := unmarshalTripIndex(timetableHome) if err != nil { return codeIndex, nameIndex, lineIndex, tripIndex, - fmt.Errorf("while unmarshalling trip index: %w\n", err) + fmt.Errorf("while unmarshalling trip index: %w", err) } codeIndex[validity] = cIx nameIndex[validity] = nIx diff --git a/traffic/convert.go b/traffic/convert.go index bd44f5a25d5c2ca2e0686bebad081d5cc2264ecb..dc2b446b5149f1dc18fc0e1a59b63f76e20823f9 100644 --- a/traffic/convert.go +++ b/traffic/convert.go @@ -272,7 +272,7 @@ request.Header.Add("If-None-Match", args.etags[url]) client := http.Client{} // todo timeout response, err := client.Do(request) if err != nil { - return gott.Tuple{args}, fmt.Errorf("while downloading gtfs %s %w\n", name, err) + return gott.Tuple{args}, fmt.Errorf("while downloading gtfs %s %w", name, err) } if response.StatusCode != http.StatusOK && response.StatusCode != http.StatusNotModified { return gott.Tuple{args}, fmt.Errorf("wrong response code %d for %s: %w", response.StatusCode, url, err) @@ -285,12 +285,12 @@ continue } file, err := os.Create(zipPath) if err != nil { - return gott.Tuple{args}, fmt.Errorf("while creating zip for %s %w\n", name, err) + return gott.Tuple{args}, fmt.Errorf("while creating zip for %s %w", name, err) } defer file.Close() _, err = io.Copy(file, response.Body) if err != nil { - return gott.Tuple{args}, fmt.Errorf("while copying gtfs %s %w\n", name, err) + return gott.Tuple{args}, fmt.Errorf("while copying gtfs %s %w", name, err) } names = append(names, name) } diff --git a/traffic/realtime_gtfs.go b/traffic/realtime_gtfs.go index cfe6f1144871979ddc3e81e055b87866ff662fde..3b743aff0ea66e9c0953feffeb5e42a452cd91f8 100644 --- a/traffic/realtime_gtfs.go +++ b/traffic/realtime_gtfs.go @@ -172,7 +172,7 @@ } if passed := now - lastUpdatedGtfsRt[feedID][feedType]; passed > 30 { message, err := gtfs_rt.GetMessages(feedID, feeds[feedType]) if err != nil { - return fmt.Errorf("while getting messages: %w\n", err) + return fmt.Errorf("while getting messages: %w", err) } switch feedType { @@ -197,7 +197,7 @@ func getGtfsRealtimeUpdates(_ string, _ int, _ string, ctx Context) (map[string]Update, bool, error) { feedInfo, err := getFeedInfo(ctx.DataHome, ctx.FeedID, ctx.Version) if err != nil { - return map[string]Update{}, true, fmt.Errorf("while getting feedInfo: %w\n", err) + return map[string]Update{}, true, fmt.Errorf("while getting feedInfo: %w", err) } getGtfsRealtimeMessages(TRIP_UPDATES, ctx.FeedID, feedInfo.RealtimeFeeds) @@ -212,7 +212,7 @@ func getGtfsRealtimeVehicles(ctx Context) ([]VehicleStatus, error) { feedInfo, err := getFeedInfo(ctx.DataHome, ctx.FeedID, ctx.Version) if err != nil { - return []VehicleStatus{}, fmt.Errorf("while getting feedInfo: %w\n", err) + return []VehicleStatus{}, fmt.Errorf("while getting feedInfo: %w", err) } getGtfsRealtimeMessages(VEHICLE_POSITIONS, ctx.FeedID, feedInfo.RealtimeFeeds)