From d9767ae738045ebf1bd483ae708af80fa384ca9f Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sat, 7 Nov 2020 17:20:29 +0300 Subject: [PATCH] daemontools friendliness --- gocheese.go | 25 ++++++++++++++++++++----- gocheese.texi | 3 +++ integrity.go | 4 ++-- passwd.go | 2 +- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/gocheese.go b/gocheese.go index 432fb6f..d467bba 100644 --- a/gocheese.go +++ b/gocheese.go @@ -43,7 +43,7 @@ import ( ) const ( - Version = "2.4.1" + Version = "2.5.0" HTMLBegin = ` @@ -96,6 +96,7 @@ var ( gpgUpdateURLPath = flag.String("gpgupdate", "/gpgupdate/", "GPG forceful refreshing URL path") pypiURL = flag.String("pypi", "https://pypi.org/simple/", "Upstream PyPI URL") passwdPath = flag.String("passwd", "passwd", "Path to file with authenticators") + logTimestamped = flag.Bool("log-timestamped", false, "Prepend timestmap to log messages") passwdCheck = flag.Bool("passwd-check", false, "Test the -passwd file for syntax errors and exit") fsck = flag.Bool("fsck", false, "Check integrity of all packages (errors are in stderr)") maxClients = flag.Int("maxclients", 128, "Maximal amount of simultaneous clients") @@ -264,31 +265,39 @@ func main() { return } if *version { - fmt.Println("GoCheese version", Version, "built with", runtime.Version()) + fmt.Println("GoCheese", Version, "built with", runtime.Version()) return } + + if *logTimestamped { + log.SetFlags(log.Ldate | log.Lmicroseconds | log.Lshortfile) + } else { + log.SetFlags(log.Lshortfile) + } + log.SetOutput(os.Stdout) + if *fsck { if !goodIntegrity() { os.Exit(1) } return } + if *passwdCheck { refreshPasswd() return } + if (*tlsCert != "" && *tlsKey == "") || (*tlsCert == "" && *tlsKey != "") { log.Fatalln("Both -tls-cert and -tls-key are required") } + var err error pypiURLParsed, err = url.Parse(*pypiURL) if err != nil { log.Fatalln(err) } refreshPasswd() - log.Println("root:", *root) - log.Println("bind:", *bind) - log.Println("pypi:", *pypiURL) ln, err := net.Listen("tcp", *bind) if err != nil { @@ -325,6 +334,12 @@ func main() { cancel() }(server) + log.Println( + "GoCheese", Version, "listens:", + "root:", *root, + "bind:", *bind, + "pypi:", *pypiURL, + ) if *tlsCert == "" { err = server.Serve(ln) } else { diff --git a/gocheese.texi b/gocheese.texi index ee620dc..f4b6f81 100644 --- a/gocheese.texi +++ b/gocheese.texi @@ -119,6 +119,9 @@ Pay attention that you have to manually create corresponding private package directory! You are not allowed to upload anything explicitly flagged as internal package. +It is advisable to run GoCheese under some kind of +@url{http://cr.yp.to/daemontools.html, daemontools}. + @node Passwords @unnumbered Password authentication diff --git a/integrity.go b/integrity.go index dc9c51e..f6f39e6 100644 --- a/integrity.go +++ b/integrity.go @@ -61,10 +61,10 @@ func goodIntegrity() bool { log.Fatal(err) } if bytes.Compare(hasher.Sum(digest[:0]), data) == 0 { - fmt.Println(pkgName, "GOOD") + fmt.Println("GOOD", pkgName) } else { isGood = false - fmt.Fprintln(os.Stderr, pkgName, "BAD") + fmt.Println("BAD", pkgName) } hasher.Reset() } diff --git a/passwd.go b/passwd.go index dae17a5..2a473f6 100644 --- a/passwd.go +++ b/passwd.go @@ -77,7 +77,7 @@ func refreshPasswd() { log.Fatalf("%s:%d: %s: %s", *passwdPath, i, login, err) } passwordsNew[login] = auther - log.Println("added password for " + login) + log.Println("added password for:", login) } passwords = passwordsNew } -- 2.44.0