X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=gocheese.go;h=d467bba22209ea413be5cc05f6a68d89c5e8d50f;hb=d9767ae738045ebf1bd483ae708af80fa384ca9f;hp=905856df61fc53a15c7bb1993b2b988947909825;hpb=0d804c602fbc55f58d04fa9657950f3a6aac6d81;p=gocheese.git
diff --git a/gocheese.go b/gocheese.go
index 905856d..d467bba 100644
--- a/gocheese.go
+++ b/gocheese.go
@@ -43,6 +43,7 @@ import (
)
const (
+ Version = "2.5.0"
HTMLBegin = `
@@ -68,15 +69,18 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .`
)
+const (
+ HashAlgoSHA256 = "sha256"
+ HashAlgoBLAKE2b256 = "blake2_256"
+ HashAlgoSHA512 = "sha512"
+ HashAlgoMD5 = "md5"
+)
+
var (
pkgPyPI = regexp.MustCompile(`^.*]*>(.+)
.*$`)
normalizationRe = regexp.MustCompilePOSIX("[-_.]+")
- HashAlgoSHA256 = "sha256"
- HashAlgoBLAKE2b256 = "blake2_256"
- HashAlgoSHA512 = "sha512"
- HashAlgoMD5 = "md5"
- knownHashAlgos []string = []string{
+ knownHashAlgos []string = []string{
HashAlgoSHA256,
HashAlgoBLAKE2b256,
HashAlgoSHA512,
@@ -92,13 +96,13 @@ 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")
+ fsck = flag.Bool("fsck", false, "Check integrity of all packages (errors are in stderr)")
maxClients = flag.Int("maxclients", 128, "Maximal amount of simultaneous clients")
version = flag.Bool("version", false, "Print version information")
warranty = flag.Bool("warranty", false, "Print warranty information")
- Version string = "UNKNOWN"
killed bool
pypiURLParsed *url.URL
)
@@ -261,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 {
@@ -322,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 {