Skip to content

Commit

Permalink
Add Totoval monitor
Browse files Browse the repository at this point in the history
Signed-off-by: Toby Yan <me@tobyan.com>
  • Loading branch information
toby1991 committed Aug 1, 2019
1 parent e27498b commit 9f6ec81
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 13 deletions.
6 changes: 5 additions & 1 deletion .env.example.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@
"APP_NAME": "Totoval",
"APP_ENV": "develop",
"APP_DEBUG": true,
"APP_PORT": 80,
"APP_PORT": "80",
"APP_LOCALE": "en",
"APP_KEY": "YOUR-APP-KEY",

"MONITOR_PORT": "8080",
"MONITOR_USERNAME": "Totoval",
"MONITOR_PASSWORD": "Passw0rd",

"DB_CONNECTION": "mysql",
"DB_HOST": "127.0.0.1",
"DB_PORT": "3306",
Expand Down
15 changes: 15 additions & 0 deletions bootstrap/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import (
"github.com/totoval/framework/database"
"github.com/totoval/framework/helpers/m"
"github.com/totoval/framework/helpers/zone"
"github.com/totoval/framework/http/middleware"
"github.com/totoval/framework/logs"
"github.com/totoval/framework/queue"
"github.com/totoval/framework/request"
"github.com/totoval/framework/sentry"
"github.com/totoval/framework/validator"

Expand All @@ -15,6 +17,8 @@ import (
"totoval/app/listeners"
"totoval/config"
"totoval/resources/lang"

c "github.com/totoval/framework/config"
)

func Initialize() {
Expand All @@ -33,3 +37,14 @@ func Initialize() {

validator.UpgradeValidatorV8toV9()
}

func Middleware(r *request.Engine) {
r.Use(middleware.RequestLogger())

if c.GetString("app.env") == "production" {
r.Use(middleware.Logger())
r.Use(middleware.Recovery())
}

r.Use(middleware.Locale())
}
15 changes: 15 additions & 0 deletions config/monitor.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package config

import (
. "github.com/totoval/framework/config"
)

func init() {
monitor := make(map[string]interface{})

monitor["port"] = Env("MONITOR_PORT", "8080")
monitor["username"] = Env("MONITOR_USERNAME", "Totoval")
monitor["password"] = Env("MONITOR_PASSWORD", "Passw0rd")

Add("monitor", monitor)
}
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ module totoval
require (
github.com/golang/protobuf v1.3.1
github.com/jinzhu/gorm v1.9.2
github.com/totoval/framework v0.11.0-alpha.3
github.com/totoval/framework v0.11.0-alpha.4
github.com/urfave/cli v1.20.0
)
15 changes: 4 additions & 11 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/totoval/framework/helpers/log"
"github.com/totoval/framework/helpers/toto"
"github.com/totoval/framework/helpers/zone"
"github.com/totoval/framework/http/middleware"
"github.com/totoval/framework/monitor"
"github.com/totoval/framework/request"
"github.com/totoval/framework/sentry"

Expand Down Expand Up @@ -53,6 +53,8 @@ func main() {
wg := &sync.WaitGroup{}
wg.Add(1)
go httpServe(ctx, wg)
wg.Add(1)
go monitor.HttpMonitorServe(ctx, wg)

wg.Wait()
}
Expand All @@ -62,16 +64,7 @@ func httpServe(parentCtx context.Context, wg *sync.WaitGroup) {

sentry.Use(r.GinEngine(), false)

if c.GetBool("app.debug") {
r.Use(middleware.RequestLogger())
}

if c.GetString("app.env") == "production" {
r.Use(middleware.Logger())
r.Use(middleware.Recovery())
}

r.Use(middleware.Locale())
bootstrap.Middleware(r)

//r.Use(middleware.IUser(&models.YourUserModel{})) // set default auth user model, or use config auth.model_ptr

Expand Down

0 comments on commit 9f6ec81

Please sign in to comment.