Drop 'ln' from logging functions
Per doc in sklog package, the Infoln, Errorln, etc. functions are
identical to the Info, Error, etc. functions. Simplify by removing the
duplicates.
Based on example from
https://skia-review.googlesource.com/c/buildbot/+/247460, this CL was
created with:
for f in Debug Info Warning Error Fatal; do
perl -pi -e "s/sklog\.${f}ln/sklog\.${f}/g" `git grep --files-with-matches "${f}ln"`
done
go/sklog/sklog.go was modified manually.
Change-Id: I130775a004bf4ae1e33caf8a9db008a599fee9fd
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/251016
Auto-Submit: Ben Wagner aka dogben <benjaminwagner@google.com>
Reviewed-by: Leandro Lovisolo <lovisolo@google.com>
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
diff --git a/am/go/alert-to-pubsub/main.go b/am/go/alert-to-pubsub/main.go
index 46ed9a1..27c162d 100644
--- a/am/go/alert-to-pubsub/main.go
+++ b/am/go/alert-to-pubsub/main.go
@@ -227,6 +227,6 @@
h := httputils.LoggingRequestResponse(r)
h = httputils.HealthzAndHTTPS(h)
http.Handle("/", h)
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
sklog.Fatal(http.ListenAndServe(*port, nil))
}
diff --git a/android_compile/go/android_compile_be/checkouts.go b/android_compile/go/android_compile_be/checkouts.go
index 217164e..5c6fc48 100644
--- a/android_compile/go/android_compile_be/checkouts.go
+++ b/android_compile/go/android_compile_be/checkouts.go
@@ -240,7 +240,7 @@
}
if _, err := sk_exec.RunCwd(ctx, checkoutPath, initCmd...); err != nil {
errMsg := fmt.Sprintf("Failed to init the repo at %s: %s", checkoutPath, err)
- sklog.Errorln(errMsg)
+ sklog.Error(errMsg)
return errors.New(errMsg)
}
return nil
@@ -286,7 +286,7 @@
cleanCheckoutOutput, err := sk_exec.RunSimple(ctx, cleanCheckoutCmd)
if err != nil {
errMsg := fmt.Sprintf("Failed to clean checkout: %s", err)
- sklog.Errorln(errMsg)
+ sklog.Error(errMsg)
return errors.New(errMsg)
}
sklog.Infof("Output: %s", cleanCheckoutOutput)
@@ -342,7 +342,7 @@
}
if _, err := sk_exec.RunCwd(ctx, checkoutPath, repoSyncArgs...); err != nil {
errMsg := fmt.Sprintf("Failed to sync the repo at %s: %s", checkoutBase, err)
- sklog.Errorln(errMsg)
+ sklog.Error(errMsg)
return errors.New(errMsg)
}
diff --git a/android_ingest/go/androidingest/main.go b/android_ingest/go/androidingest/main.go
index 4ef6df4..1216afd 100644
--- a/android_ingest/go/androidingest/main.go
+++ b/android_ingest/go/androidingest/main.go
@@ -317,6 +317,6 @@
}
http.Handle("/", h)
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
sklog.Fatal(http.ListenAndServe(*port, nil))
}
diff --git a/api/go/api/main.go b/api/go/api/main.go
index 84ef917..54a4d03 100644
--- a/api/go/api/main.go
+++ b/api/go/api/main.go
@@ -34,6 +34,6 @@
}
http.Handle("/", h)
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
sklog.Fatal(http.ListenAndServe(*port, nil))
}
diff --git a/contestk/go/contest/main.go b/contestk/go/contest/main.go
index cb081ba..508e1fd 100644
--- a/contestk/go/contest/main.go
+++ b/contestk/go/contest/main.go
@@ -221,6 +221,6 @@
h = httputils.HealthzAndHTTPS(h)
}
http.Handle("/", h)
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
sklog.Fatal(http.ListenAndServe(*port, nil))
}
diff --git a/ct/go/copy_datastore/main.go b/ct/go/copy_datastore/main.go
index 308d802..284cc01 100644
--- a/ct/go/copy_datastore/main.go
+++ b/ct/go/copy_datastore/main.go
@@ -65,5 +65,5 @@
sklog.Fatal(err)
}
}
- sklog.Infoln("Database migration finished.")
+ sklog.Info("Database migration finished.")
}
diff --git a/ct/go/worker_scripts/run_chromium_analysis/main.go b/ct/go/worker_scripts/run_chromium_analysis/main.go
index 1944abd..450517e 100644
--- a/ct/go/worker_scripts/run_chromium_analysis/main.go
+++ b/ct/go/worker_scripts/run_chromium_analysis/main.go
@@ -165,9 +165,9 @@
// continue to be serial because it will help guard against
// crashes/flakiness/inconsistencies which are more prevalent in mobile runs.
numWorkers = 1
- sklog.Infoln("===== Going to run the task serially =====")
+ sklog.Info("===== Going to run the task serially =====")
} else {
- sklog.Infoln("===== Going to run the task with parallel chrome processes =====")
+ sklog.Info("===== Going to run the task with parallel chrome processes =====")
}
// Create channel that contains all pageset file names. This channel will
diff --git a/ct/go/worker_scripts/run_chromium_perf/main.go b/ct/go/worker_scripts/run_chromium_perf/main.go
index 0526727..c741729 100644
--- a/ct/go/worker_scripts/run_chromium_perf/main.go
+++ b/ct/go/worker_scripts/run_chromium_perf/main.go
@@ -184,9 +184,9 @@
// continue to be serial because it will help guard against
// crashes/flakiness/inconsistencies which are more prevalent in mobile runs.
numWorkers = 1
- sklog.Infoln("===== Going to run the task serially =====")
+ sklog.Info("===== Going to run the task serially =====")
} else {
- sklog.Infoln("===== Going to run the task with parallel chrome processes =====")
+ sklog.Info("===== Going to run the task with parallel chrome processes =====")
}
// Create channel that contains all pageset file names. This channel will
diff --git a/debugger-assets/go/debugger-assets/main.go b/debugger-assets/go/debugger-assets/main.go
index 49a1084..55cff4f 100644
--- a/debugger-assets/go/debugger-assets/main.go
+++ b/debugger-assets/go/debugger-assets/main.go
@@ -94,6 +94,6 @@
router.HandleFunc("/", mainHandler)
http.Handle("/", httputils.HealthzAndHTTPS(httputils.LoggingRequestResponse(router)))
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
sklog.Fatal(http.ListenAndServe(*port, nil))
}
diff --git a/debugger/go/debugger/main.go b/debugger/go/debugger/main.go
index 69b1bcb..a5de47c 100644
--- a/debugger/go/debugger/main.go
+++ b/debugger/go/debugger/main.go
@@ -57,7 +57,7 @@
loadTemplates()
}
if err := templates.ExecuteTemplate(w, name, struct{}{}); err != nil {
- sklog.Errorln("Failed to expand template:", err)
+ sklog.Error("Failed to expand template:", err)
}
}
}
@@ -204,6 +204,6 @@
}
http.Handle("/", h)
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
sklog.Fatal(http.ListenAndServe(*port, nil))
}
diff --git a/docserverk/go/docserverk/main.go b/docserverk/go/docserverk/main.go
index 5a0e896..b63008a 100644
--- a/docserverk/go/docserverk/main.go
+++ b/docserverk/go/docserverk/main.go
@@ -203,7 +203,7 @@
Nav: d.Navigation(),
}
if err := indexTemplate.Execute(w, content); err != nil {
- sklog.Errorln("Failed to expand template:", err)
+ sklog.Error("Failed to expand template:", err)
}
}
}
@@ -248,6 +248,6 @@
}
http.Handle("/", h)
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
sklog.Fatal(http.ListenAndServe(*port, nil))
}
diff --git a/fiddlek/go/fiddle/main.go b/fiddlek/go/fiddle/main.go
index 0054113..832f4c6 100644
--- a/fiddlek/go/fiddle/main.go
+++ b/fiddlek/go/fiddle/main.go
@@ -553,6 +553,6 @@
h := httputils.LoggingGzipRequestResponse(r)
h = httputils.HealthzAndHTTPS(h)
http.Handle("/", h)
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
sklog.Fatal(http.ListenAndServe(*port, nil))
}
diff --git a/fiddlek/go/fiddler/main.go b/fiddlek/go/fiddler/main.go
index 15cf17f..285e630 100644
--- a/fiddlek/go/fiddler/main.go
+++ b/fiddlek/go/fiddler/main.go
@@ -397,7 +397,7 @@
h := httputils.LoggingGzipRequestResponse(r)
h = httputils.Healthz(r)
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
srv := &http.Server{
Handler: h,
diff --git a/go/baseapp/baseapp.go b/go/baseapp/baseapp.go
index 3eb3d34..affb8d7 100644
--- a/go/baseapp/baseapp.go
+++ b/go/baseapp/baseapp.go
@@ -177,7 +177,7 @@
r.Use(middleware...)
// Start serving.
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
server := &http.Server{
Addr: *Port,
Handler: r,
diff --git a/go/grpclog/grpclog.go b/go/grpclog/grpclog.go
index 3dc8432..c5f80fc 100644
--- a/go/grpclog/grpclog.go
+++ b/go/grpclog/grpclog.go
@@ -15,7 +15,7 @@
sklog.Fatalf(format, args...)
}
func (g *logger) Fatalln(args ...interface{}) {
- sklog.Fatalln(args...)
+ sklog.Fatal(args...)
}
func (g *logger) Print(args ...interface{}) {
sklog.Info(args...)
@@ -24,7 +24,7 @@
sklog.Infof(format, args...)
}
func (g *logger) Println(args ...interface{}) {
- sklog.Infoln(args...)
+ sklog.Info(args...)
}
// Init sets up grpc logging using sklog.
diff --git a/go/httputils/http.go b/go/httputils/http.go
index 4a0a7f1..ed87995 100644
--- a/go/httputils/http.go
+++ b/go/httputils/http.go
@@ -372,7 +372,7 @@
// The message parameter is returned in the HTTP response. If it is not provided then
// "Unknown error" will be returned instead.
func ReportError(w http.ResponseWriter, err error, message string, code int) {
- sklog.Errorln(message, err)
+ sklog.Error(message, err)
if err != io.ErrClosedPipe {
httpErrMsg := message
if message == "" {
diff --git a/go/sklog/sklog.go b/go/sklog/sklog.go
index 71ecbfe..55f6a9e 100644
--- a/go/sklog/sklog.go
+++ b/go/sklog/sklog.go
@@ -1,5 +1,5 @@
// The package sklog offers a way to log using glog or Google Cloud Logging in a seemless way.
-// By default, the Module level functions (e.g. Infof, Errorln) will all log using glog. Simply
+// By default, the Module level functions (e.g. Infof, Error) will all log using glog. Simply
// call sklog.InitCloudLogging() to immediately start sending log messages to the configured
// Google Cloud Logging endpoint.
@@ -71,9 +71,7 @@
// These convenience methods will either make a Cloud Logging Entry using the current time and the
// default report name associated with the CloudLogger or log to glog if Cloud Logging is not
-// configured. They are a superset of the glog interface. Info and Infoln do the same thing
-// (as do all pairs), because adding a newline to the end of a Cloud Logging Entry or a glog entry
-// means nothing as all logs are separate entries. InfofWithDepth allow the caller to change
+// configured. They are a superset of the glog interface. InfofWithDepth allow the caller to change
// where the stacktrace starts. 0 (the default in all other calls) means to report starting at
// the caller. 1 would mean one level above, the caller's caller. 2 would be a level above that
// and so on.
@@ -92,10 +90,6 @@
log(depth, DEBUG, defaultReportName, fmt.Sprintf(format, v...))
}
-func Debugln(msg ...interface{}) {
- sawLogWithSeverity(DEBUG)
- log(0, DEBUG, defaultReportName, fmt.Sprintln(msg...))
-}
func Info(msg ...interface{}) {
sawLogWithSeverity(INFO)
log(0, INFO, defaultReportName, fmt.Sprint(msg...))
@@ -111,11 +105,6 @@
log(depth, INFO, defaultReportName, fmt.Sprintf(format, v...))
}
-func Infoln(msg ...interface{}) {
- sawLogWithSeverity(INFO)
- log(0, INFO, defaultReportName, fmt.Sprintln(msg...))
-}
-
func Warning(msg ...interface{}) {
sawLogWithSeverity(WARNING)
log(0, WARNING, defaultReportName, fmt.Sprint(msg...))
@@ -131,11 +120,6 @@
log(depth, WARNING, defaultReportName, fmt.Sprintf(format, v...))
}
-func Warningln(msg ...interface{}) {
- sawLogWithSeverity(WARNING)
- log(0, WARNING, defaultReportName, fmt.Sprintln(msg...))
-}
-
func Error(msg ...interface{}) {
sawLogWithSeverity(ERROR)
log(0, ERROR, defaultReportName, fmt.Sprint(msg...))
@@ -151,11 +135,6 @@
log(depth, ERROR, defaultReportName, fmt.Sprintf(format, v...))
}
-func Errorln(msg ...interface{}) {
- sawLogWithSeverity(ERROR)
- log(0, ERROR, defaultReportName, fmt.Sprintln(msg...))
-}
-
// Fatal* uses an ALERT Cloud Logging Severity and then panics, similar to glog.Fatalf()
// In Fatal*, there is no callback to sawLogWithSeverity, as the program will soon exit
// and the counter will be reset to 0.
@@ -171,10 +150,6 @@
log(depth, ALERT, defaultReportName, fmt.Sprintf(format, v...))
}
-func Fatalln(msg ...interface{}) {
- log(0, ALERT, defaultReportName, fmt.Sprintln(msg...))
-}
-
func Flush() {
if logger != nil {
logger.Flush()
diff --git a/go/util/repo.go b/go/util/repo.go
index 046ba4a..70f5069 100644
--- a/go/util/repo.go
+++ b/go/util/repo.go
@@ -25,10 +25,10 @@
func NewTempRepoFrom(zipfile string) *TempRepo {
tmpdir, err := ioutil.TempDir("", "skiaperf")
if err != nil {
- sklog.Fatalln("Failed to create testing Git repo:", err)
+ sklog.Fatal("Failed to create testing Git repo:", err)
}
if err := UnZip(tmpdir, zipfile); err != nil {
- sklog.Fatalln("Failed to unzip testing Git repo:", err)
+ sklog.Fatal("Failed to unzip testing Git repo:", err)
}
return &TempRepo{Dir: tmpdir}
}
@@ -46,6 +46,6 @@
// Cleanup cleans up the temporary repo.
func (t *TempRepo) Cleanup() {
if err := os.RemoveAll(t.Dir); err != nil {
- sklog.Fatalln("Failed to clean up after test:", err)
+ sklog.Fatal("Failed to clean up after test:", err)
}
}
diff --git a/golden/cmd/logextractor/main.go b/golden/cmd/logextractor/main.go
index ad4db9b..0ab9737 100644
--- a/golden/cmd/logextractor/main.go
+++ b/golden/cmd/logextractor/main.go
@@ -31,7 +31,7 @@
common.Init()
if (*logInputDir == "") || (!fileutil.FileExists(*logInputDir)) {
- sklog.Errorln("Flag 'input_dir' must be set and the directory must exist.")
+ sklog.Error("Flag 'input_dir' must be set and the directory must exist.")
os.Exit(1)
}
diff --git a/golden/cmd/skia_diff_server/main.go b/golden/cmd/skia_diff_server/main.go
index 3f130ba..884442d 100644
--- a/golden/cmd/skia_diff_server/main.go
+++ b/golden/cmd/skia_diff_server/main.go
@@ -138,7 +138,7 @@
// Start the HTTP server.
go func() {
- sklog.Infoln("Serving on http://127.0.0.1" + *imagePort)
+ sklog.Info("Serving on http://127.0.0.1" + *imagePort)
sklog.Fatal(http.ListenAndServe(*imagePort, nil))
}()
diff --git a/golden/cmd/skia_knowledge/main.go b/golden/cmd/skia_knowledge/main.go
index 16e5234..678d020 100644
--- a/golden/cmd/skia_knowledge/main.go
+++ b/golden/cmd/skia_knowledge/main.go
@@ -64,13 +64,13 @@
if err != nil {
sklog.Fatalf("Error loading meta data: %s", err)
}
- sklog.Infoln("Meta data loaded from Gold.")
+ sklog.Info("Meta data loaded from Gold.")
// Write the index file to disk.
if err := export.WriteTestRecordsFile(testRecords, useIndexPath); err != nil {
sklog.Fatalf("Error writing index file: %s", err)
}
- sklog.Infoln("Index file written to disk.")
+ sklog.Info("Index file written to disk.")
// If an output directory was given, download the images referenced in the index file.
if *outputDir != "" {
diff --git a/jsdoc/go/jsdoc/main.go b/jsdoc/go/jsdoc/main.go
index 1a0f529..34be29b 100644
--- a/jsdoc/go/jsdoc/main.go
+++ b/jsdoc/go/jsdoc/main.go
@@ -39,6 +39,6 @@
}
http.Handle("/", h)
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
sklog.Fatal(http.ListenAndServe(*port, nil))
}
diff --git a/jsfiddle/go/jsfiddle/main.go b/jsfiddle/go/jsfiddle/main.go
index 2b6ef87..0e3426b 100644
--- a/jsfiddle/go/jsfiddle/main.go
+++ b/jsfiddle/go/jsfiddle/main.go
@@ -205,6 +205,6 @@
h := httputils.LoggingGzipRequestResponse(r)
h = httputils.HealthzAndHTTPS(h)
http.Handle("/", h)
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
sklog.Fatal(http.ListenAndServe(*port, nil))
}
diff --git a/named-fiddles/go/named-fiddles/main.go b/named-fiddles/go/named-fiddles/main.go
index dde29e0..9a0ba0c 100644
--- a/named-fiddles/go/named-fiddles/main.go
+++ b/named-fiddles/go/named-fiddles/main.go
@@ -479,6 +479,6 @@
}
http.Handle("/", h)
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
sklog.Fatal(http.ListenAndServe(*port, nil))
}
diff --git a/particles/go/particles/main.go b/particles/go/particles/main.go
index 523d266..ecc304d 100644
--- a/particles/go/particles/main.go
+++ b/particles/go/particles/main.go
@@ -271,6 +271,6 @@
}
http.Handle("/", h)
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
sklog.Fatal(http.ListenAndServe(*port, nil))
}
diff --git a/perf/go/skiaperf/main.go b/perf/go/skiaperf/main.go
index fbd969d..2be41bc 100644
--- a/perf/go/skiaperf/main.go
+++ b/perf/go/skiaperf/main.go
@@ -201,7 +201,7 @@
sklog.Errorf("Failed to JSON encode sk.perf context: %s", err)
}
if err := templates.ExecuteTemplate(w, name, map[string]template.JS{"context": template.JS(string(b))}); err != nil {
- sklog.Errorln("Failed to expand template:", err)
+ sklog.Error("Failed to expand template:", err)
}
}
}
@@ -214,7 +214,7 @@
loadTemplates()
}
if err := templates.ExecuteTemplate(w, name, nil); err != nil {
- sklog.Errorln("Failed to expand template:", err)
+ sklog.Error("Failed to expand template:", err)
}
}
}
@@ -418,7 +418,7 @@
return
}
if err := templates.ExecuteTemplate(w, "activitylog.html", a); err != nil {
- sklog.Errorln("Failed to expand template:", err)
+ sklog.Error("Failed to expand template:", err)
}
}
@@ -432,7 +432,7 @@
w.Header().Set("Content-Type", "text/html")
ctx := calc.NewContext(nil, nil)
if err := templates.ExecuteTemplate(w, "help.html", ctx); err != nil {
- sklog.Errorln("Failed to expand template:", err)
+ sklog.Error("Failed to expand template:", err)
}
}
}
@@ -446,7 +446,7 @@
if r.Method == "GET" {
w.Header().Set("Content-Type", "text/html")
if err := templates.ExecuteTemplate(w, "offline.html", nil); err != nil {
- sklog.Errorln("Failed to expand template:", err)
+ sklog.Error("Failed to expand template:", err)
}
}
}
@@ -1620,6 +1620,6 @@
}
http.Handle("/", h)
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
sklog.Fatal(http.ListenAndServe(*port, nil))
}
diff --git a/power/go/gatherer/gatherer.go b/power/go/gatherer/gatherer.go
index c5351db..31595ac 100644
--- a/power/go/gatherer/gatherer.go
+++ b/power/go/gatherer/gatherer.go
@@ -116,7 +116,7 @@
// intersect of those lists and sets the result in g.downBots.
func (g *gatherer) update() {
// Ask Swarming API for list of bots down in the pools we care about
- sklog.Infoln("Polling PromAlerts and Swarming API for down bots")
+ sklog.Info("Polling PromAlerts and Swarming API for down bots")
bots := []*swarming.SwarmingRpcsBotInfo{}
for _, pool := range skswarming.POOLS_PRIVATE {
xb, err := g.iSwarming.ListDownBots(pool)
diff --git a/proberk/go/proberk/main.go b/proberk/go/proberk/main.go
index 7092d90..5688301 100644
--- a/proberk/go/proberk/main.go
+++ b/proberk/go/proberk/main.go
@@ -331,7 +331,7 @@
var err error
startHash, err = getHash()
if err != nil {
- sklog.Fatalln("Failed to calculate hash of config file: ", err)
+ sklog.Fatal("Failed to calculate hash of config file: ", err)
}
cfg, err := readConfigFile(*config)
if *validate {
@@ -343,7 +343,7 @@
os.Exit(0)
}
if err != nil {
- sklog.Fatalln("Failed to read config file: ", err)
+ sklog.Fatal("Failed to read config file: ", err)
}
liveness := metrics2.NewLiveness("probes")
diff --git a/pulld/go/pulld/main.go b/pulld/go/pulld/main.go
index 88ece36..b2dc990 100644
--- a/pulld/go/pulld/main.go
+++ b/pulld/go/pulld/main.go
@@ -294,6 +294,6 @@
r.HandleFunc("/_/change", changeHandler).Methods("POST")
r.PathPrefix("/").HandlerFunc(httputils.MakeResourceHandler(*resourcesDir))
http.Handle("/", httputils.LoggingGzipRequestResponse(r))
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
sklog.Fatal(http.ListenAndServe(*port, nil))
}
diff --git a/push/go/push/main.go b/push/go/push/main.go
index ff73c0c..e0bdebc 100644
--- a/push/go/push/main.go
+++ b/push/go/push/main.go
@@ -559,6 +559,6 @@
}
r.PathPrefix("/").HandlerFunc(httputils.MakeResourceHandler(*resourcesDir))
http.Handle("/", httputils.HealthzAndHTTPS(httputils.LoggingGzipRequestResponse(r)))
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
sklog.Fatal(http.ListenAndServe(*port, nil))
}
diff --git a/skolo/go/powercycle-daemon/main.go b/skolo/go/powercycle-daemon/main.go
index 76e8084..23512e3 100644
--- a/skolo/go/powercycle-daemon/main.go
+++ b/skolo/go/powercycle-daemon/main.go
@@ -75,6 +75,6 @@
r.HandleFunc("/powercycled_bots", powercycledHandler).Methods("POST")
http.Handle("/", httputils.LoggingGzipRequestResponse(r))
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
sklog.Fatal(http.ListenAndServe(*port, nil))
}
diff --git a/skolo/go/powercycle/seeeduino.go b/skolo/go/powercycle/seeeduino.go
index 217e8de..727523d 100644
--- a/skolo/go/powercycle/seeeduino.go
+++ b/skolo/go/powercycle/seeeduino.go
@@ -67,7 +67,7 @@
return fmt.Errorf("Unable to connect to Seeduino to reboot: %v", err)
} else {
sklog.Infof(`Response was %s - "500 OK" means everything was good, the HTTP response just responded early.`, resp.Status)
- sklog.Debugln(httputils.ReadAndClose(resp.Body))
+ sklog.Debug(httputils.ReadAndClose(resp.Body))
}
// The request returns early, so we make sure to wait so we don't
// trigger multiple servos at once.
diff --git a/skottie/go/skottie/main.go b/skottie/go/skottie/main.go
index 2159bd2..eea67b6 100644
--- a/skottie/go/skottie/main.go
+++ b/skottie/go/skottie/main.go
@@ -531,6 +531,6 @@
}
http.Handle("/", h)
- sklog.Infoln("Ready to serve.")
+ sklog.Info("Ready to serve.")
sklog.Fatal(http.ListenAndServe(*port, nil))
}
diff --git a/status/go/capacity/capacity.go b/status/go/capacity/capacity.go
index 9f36a05..8103ada 100644
--- a/status/go/capacity/capacity.go
+++ b/status/go/capacity/capacity.go
@@ -285,7 +285,7 @@
// QueryAll updates the capacity metrics.
func (c *CapacityClient) QueryAll(ctx context.Context) error {
- sklog.Infoln("Recounting Capacity Stats")
+ sklog.Info("Recounting Capacity Stats")
durations, err := c.getTaskDurations()
if err != nil {
