parent
fecd343f1b
commit
e4632d36ba
1
TODO
1
TODO
|
|
@ -36,3 +36,4 @@ x move auth as flag in router
|
||||||
x . and ../** as roots cause bugs in listing and loading and linking
|
x . and ../** as roots cause bugs in listing and loading and linking
|
||||||
x `create` at root is a 400, base= in URL (when `create` input is empty)
|
x `create` at root is a 400, base= in URL (when `create` input is empty)
|
||||||
delete top-level pages
|
delete top-level pages
|
||||||
|
versioning
|
||||||
|
|
|
||||||
|
|
@ -8,14 +8,16 @@ import (
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
Root string
|
Root string
|
||||||
Port string
|
Port string
|
||||||
Head string
|
Head string
|
||||||
Foot string
|
Foot string
|
||||||
OAuthServer string
|
OAuthServer string
|
||||||
|
VersionInterval time.Duration
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
|
@ -32,6 +34,7 @@ func Refresh() {
|
||||||
as.Append(args.STRING, "port", "port to listen on", "49909")
|
as.Append(args.STRING, "port", "port to listen on", "49909")
|
||||||
as.Append(args.STRING, "wrap", "file with http header/footer", "./wrapper.html")
|
as.Append(args.STRING, "wrap", "file with http header/footer", "./wrapper.html")
|
||||||
as.Append(args.STRING, "oauth", "oauth URL", "")
|
as.Append(args.STRING, "oauth", "oauth URL", "")
|
||||||
|
as.Append(args.DURATION, "version", "duration to mark versions", "0s")
|
||||||
if err := as.Parse(); err != nil {
|
if err := as.Parse(); err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
@ -52,4 +55,5 @@ func Refresh() {
|
||||||
Head = string(bs[0])
|
Head = string(bs[0])
|
||||||
Foot = string(bs[1])
|
Foot = string(bs[1])
|
||||||
OAuthServer = as.Get("oauth").GetString()
|
OAuthServer = as.Get("oauth").GetString()
|
||||||
|
VersionInterval = as.Get("version").GetDuration()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
16
main.go
16
main.go
|
|
@ -3,10 +3,12 @@ package main
|
||||||
import (
|
import (
|
||||||
"local/notes-server/config"
|
"local/notes-server/config"
|
||||||
"local/notes-server/server"
|
"local/notes-server/server"
|
||||||
|
"local/notes-server/versions"
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
@ -15,6 +17,20 @@ func main() {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
if config.VersionInterval == 0 {
|
||||||
|
log.Println("versions disabled")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
versions, err := versions.New()
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
for _ = range time.NewTicker(config.VersionInterval).C {
|
||||||
|
log.Println(versions.Gitmmit())
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
log.Printf("Serving %q on %q", config.Root, config.Port)
|
log.Printf("Serving %q on %q", config.Root, config.Port)
|
||||||
if err := http.ListenAndServe(config.Port, server); err != nil {
|
if err := http.ListenAndServe(config.Port, server); err != nil {
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,5 @@
|
||||||
asdf
|
asdf
|
||||||
searchString
|
searchString
|
||||||
|
|
||||||
|
|
||||||
|
here is my new line
|
||||||
Loading…
Reference in New Issue