)
const (
- Version = "2.4.1"
+ Version = "2.5.0"
HTMLBegin = `<!DOCTYPE html>
<html>
<head>
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")
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 {
cancel()
}(server)
+ log.Println(
+ "GoCheese", Version, "listens:",
+ "root:", *root,
+ "bind:", *bind,
+ "pypi:", *pypiURL,
+ )
if *tlsCert == "" {
err = server.Serve(ln)
} else {
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()
}
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
}