sneak/merp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

latest

Browse Source
This commit is contained in:
Jeffrey Paul 2019-11-07 00:51:35 -08:00
parent 2947ec68c1
commit ca5a726e75
6 changed files with 63 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app.yaml
View File

@ -1,8 +1,5 @@
runtime: custom runtime: custom
env: flex env: flex
env_variables:
DEBUG: 1
includes: includes:
- prod-secrets.yaml - prod-secrets.yaml

13
indexpage.go Normal file
View File

@ -0,0 +1,13 @@
package main
const basePage = `<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>{{.Title}}</title>
{{.Head}}
</head>
<body>
{{.Body}}
</body>
</html>`

28
logging.go Normal file
View File

@ -0,0 +1,28 @@
//3456789112345676892123456789312345678941234567895123456789612345678971234567898
package main
import "os"
import "time"
import "github.com/rs/zerolog"
import "github.com/rs/zerolog/log"
import "golang.org/x/crypto/ssh/terminal"
func initLogging() {
// always log in UTC
zerolog.TimestampFunc = func() time.Time {
return time.Now().UTC()
}
log.Logger = log.With().Caller().Stack().Logger()
if terminal.IsTerminal(int(os.Stdout.Fd())) {
output := zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC3339Nano}
log.Logger = zerolog.New(output).With().Caller().Stack().Logger().With().Timestamp().Logger()
}
zerolog.SetGlobalLevel(zerolog.InfoLevel)
if os.Getenv("DEBUG") != "" {
zerolog.SetGlobalLevel(zerolog.DebugLevel)
}
}

26
main.go
View File

@ -1,11 +1,7 @@
//3456789112345676892123456789312345678941234567895123456789612345678971234567898 //3456789112345676892123456789312345678941234567895123456789612345678971234567898
package merp package main
import "os"
import "time"
import "github.com/rs/zerolog"
import "github.com/rs/zerolog/log" import "github.com/rs/zerolog/log"
import "golang.org/x/crypto/ssh/terminal"
var Version string var Version string
var Buildtime string var Buildtime string
@ -28,23 +24,3 @@ func identify() {
Str("builduser", Builduser). Str("builduser", Builduser).
Msg("starting") Msg("starting")
} }
func initLogging() {
// always log in UTC
zerolog.TimestampFunc = func() time.Time {
return time.Now().UTC()
}
log.Logger = log.With().Caller().Stack().Logger()
if terminal.IsTerminal(int(os.Stdout.Fd())) {
output := zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC3339Nano}
log.Logger = zerolog.New(output).With().Caller().Stack().Logger().With().Timestamp().Logger()
}
zerolog.SetGlobalLevel(zerolog.InfoLevel)
if os.Getenv("DEBUG") != "" {
zerolog.SetGlobalLevel(zerolog.DebugLevel)
}
}

4
merp.go
View File

@ -1,4 +1,4 @@
package merp package main
import "encoding/json" import "encoding/json"
import "net/http" import "net/http"
@ -172,7 +172,7 @@ func HandleNewMerp() gin.HandlerFunc {
"thing": thing, "thing": thing,
"created": atString, "created": atString,
"content": respContent, "content": respContent,
"id": u.String(), "transaction": u.String(),
}, },
}) })
} }

18
server.go
View File

@ -1,5 +1,5 @@
//3456789112345676892123456789312345678941234567895123456789612345678971234567898 //3456789112345676892123456789312345678941234567895123456789612345678971234567898
package merp package main
import "fmt" import "fmt"
import "net/http" import "net/http"
@ -11,6 +11,12 @@ import "github.com/gin-gonic/gin"
import "github.com/dn365/gin-zerolog" import "github.com/dn365/gin-zerolog"
func serve() { func serve() {
s := getServer()
s.ListenAndServe()
}
func getRouter() *gin.Engine {
if os.Getenv("DEBUG") == "" { if os.Getenv("DEBUG") == "" {
gin.SetMode(gin.ReleaseMode) gin.SetMode(gin.ReleaseMode)
} }
@ -32,10 +38,18 @@ func serve() {
}) })
// call it, it returns the appropriate handler function // call it, it returns the appropriate handler function
// so we can execute some code at startup time
// and not just request time
r.GET("/merp/for/:thing", HandleNewMerp()) r.GET("/merp/for/:thing", HandleNewMerp())
r.GET("/get/latest/merp/for/:thing", GetLatestMerp()) r.GET("/get/latest/merp/for/:thing", GetLatestMerp())
r.GET("/get/merps/for/:thing", GetLatestMerps()) r.GET("/get/merps/for/:thing", GetLatestMerps())
return r
}
func getServer() *http.Server {
r := getRouter()
port := "8080" port := "8080"
if os.Getenv("PORT") != "" { if os.Getenv("PORT") != "" {
port = os.Getenv("PORT") port = os.Getenv("PORT")
@ -48,5 +62,5 @@ func serve() {
WriteTimeout: 10 * time.Second, WriteTimeout: 10 * time.Second,
MaxHeaderBytes: 1 << 20, MaxHeaderBytes: 1 << 20,
} }
s.ListenAndServe() return s
} }