http writes moved to 'log'

This commit is contained in:
Jeff Carr 2024-11-07 05:15:54 -06:00
parent 66bd2481ae
commit a95bed236f
3 changed files with 28 additions and 38 deletions

View File

@ -2,7 +2,6 @@
package main package main
import ( import (
"net/http"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
@ -12,8 +11,8 @@ import (
"go.wit.com/log" "go.wit.com/log"
) )
func doRelease(w http.ResponseWriter) bool { func doRelease() bool {
msg(w, "doRelease() on", me.current.Name()) log.Info("doRelease() on", me.current.Name())
// double check release version logic // double check release version logic
if me.release.releaseVersionB.String() != "release version "+me.release.version.String() { if me.release.releaseVersionB.String() != "release version "+me.release.version.String() {
log.Warn("something went wrong with the release.version:", me.release.version.String()) log.Warn("something went wrong with the release.version:", me.release.version.String())

15
http.go
View File

@ -16,15 +16,6 @@ func cleanURL(url string) string {
return url return url
} }
// send stuff to the socket and stdout
func msg(w http.ResponseWriter, a ...any) {
if w == nil {
log.Info(a)
} else {
fmt.Fprintln(w, a)
}
}
func okHandler(w http.ResponseWriter, r *http.Request) { func okHandler(w http.ResponseWriter, r *http.Request) {
var route string var route string
route = cleanURL(r.URL.Path) route = cleanURL(r.URL.Path)
@ -67,7 +58,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
} }
case "/doRelease": case "/doRelease":
buttonDisable() buttonDisable()
if doRelease(w) { if doRelease() {
buttonEnable() buttonEnable()
log.Info("doRelease() worked") log.Info("doRelease() worked")
} else { } else {
@ -218,9 +209,9 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
log.Info(repolist.ReleaseReportHeader()) log.Info(repolist.ReleaseReportHeader())
log.Info(me.current.StandardReleaseHeader()) log.Info(me.current.StandardReleaseHeader())
case "/list": case "/list":
me.repos.View.PrintReport(w, readonly, onlydirty, perfect) me.repos.View.PrintReport(readonly, onlydirty, perfect)
case "/releaseList": case "/releaseList":
me.repos.View.PrintReleaseReport(w, readonly, perfect) me.repos.View.PrintReleaseReport(readonly, perfect)
case "/quit": case "/quit":
log.Info("Got URL /quit") log.Info("Got URL /quit")
os.Exit(0) os.Exit(0)

View File

@ -60,7 +60,7 @@ func createReleaseBox(box *gui.Node) {
me.release.releaseVersionB = me.release.grid.NewButton("release version", func() { me.release.releaseVersionB = me.release.grid.NewButton("release version", func() {
buttonDisable() buttonDisable()
if doRelease(nil) { if doRelease() {
buttonEnable() buttonEnable()
log.Info("doRelease() worked") log.Info("doRelease() worked")
} else { } else {
@ -146,7 +146,7 @@ func createReleaseBox(box *gui.Node) {
// incase something, somewhere, goes wrong // incase something, somewhere, goes wrong
duration := repolist.TimeFunction(func() { duration := repolist.TimeFunction(func() {
for n := 0; n <= len(me.repos.View.AllRepos()); n++ { for n := 0; n <= len(me.repos.View.AllRepos()); n++ {
if doRelease(nil) { if doRelease() {
log.Info("doRelease() worked") log.Info("doRelease() worked")
} else { } else {
if me.release.status.String() == "ALL DONE?" { if me.release.status.String() == "ALL DONE?" {