Fail to add logfile (try buff log for gort)

Signed-off-by: adrien <adrien@iglou.eu>
pull/3/head
adrien 2 years ago
parent f13fb5c2ac
commit e03f09c73b
  1. 43
      config/process.go
  2. 2
      config/struct_check.go
  3. 4
      config/struct_config.go
  4. 2
      config/struct_error.go
  5. 2
      examples/etc/xavier-srv/config.toml
  6. 58
      main.go
  7. 0
      result.log
  8. 57
      tools/loging.go

@ -0,0 +1,43 @@
package config
import (
"fmt"
"os"
"git.iglou.eu/xavierSrv/tools"
"github.com/BurntSushi/toml"
)
// Global : External global var
var Global Config
// Check : External global var
var Check CheckList
// Error : External global var
var Error ErrorList
// Init : for init config and log
func (co *Config) Init(ch *CheckList, er *ErrorList) {
if _, err := toml.DecodeFile("./examples/etc/xavier-srv/config.toml", &co); err != nil {
panic(err)
}
if _, err := toml.DecodeFile(co.Overall.CheckListFile, &ch); err != nil {
panic(err)
}
if _, err := toml.DecodeFile(co.Overall.ErrorListFile, &er); err != nil {
panic(err)
}
if f, err := os.Create(co.Overall.LogFile); err != nil {
panic(err)
} else {
f.Close()
}
tools.PushToLog(-1, fmt.Errorf(
"=>\n--- [Xavier] ---\nLog file: %v\nApp list file: %v\nErr list file: %v\n---",
co.Overall.LogFile,
co.Overall.CheckListFile,
co.Overall.ErrorListFile,
))
}

@ -1,4 +1,4 @@
package tomlstruct
package config
// CheckList : Define struct for check list configuration file
type CheckList struct {

@ -1,9 +1,11 @@
package tomlstruct
package config
// Config : Define struct for master configuration file
type Config struct {
Overall struct {
LoopWait int `toml:"loopWait"`
LogFile string `toml:"logFile"`
LogVerbose bool `toml:"logVerbose"`
CheckListFile string `toml:"checkListFile"`
ErrorListFile string `toml:"errorListFile"`
} `toml:"overall"`

@ -1,4 +1,4 @@
package tomlstruct
package config
// ErrorList : Define struct for error list configuration file
type ErrorList struct {

@ -1,5 +1,7 @@
[overall]
loopWait = 10 # Second before retry evry thing
logFile = './result.log'
logVerbose = false
checkListFile = './examples/etc/xavier-srv/check.toml'
errorListFile = './examples/etc/xavier-srv/errors.toml'

@ -2,7 +2,6 @@ package main
import (
"errors"
"fmt"
"math/rand"
"net/http"
"strconv"
@ -10,31 +9,23 @@ import (
"sync"
"time"
"git.iglou.eu/xavierSrv/tomlstruct"
"github.com/BurntSushi/toml"
"git.iglou.eu/xavierSrv/config"
"git.iglou.eu/xavierSrv/tools"
)
var config tomlstruct.Config
var checkList tomlstruct.CheckList
var errorList tomlstruct.ErrorList
var wg sync.WaitGroup
func main() {
//init:
rand.Seed(42)
if _, err := toml.DecodeFile("./examples/etc/xavier-srv/config.toml", &config); err != nil {
panic(err)
}
if _, err := toml.DecodeFile(config.Overall.CheckListFile, &checkList); err != nil {
panic(err)
}
if _, err := toml.DecodeFile(config.Overall.ErrorListFile, &errorList); err != nil {
panic(err)
}
config.Global.Init(&config.Check, &config.Error)
tools.InitLogConf(
config.Global.Overall.LogFile,
config.Global.Overall.LogVerbose,
)
loop:
for index, team := range checkList.Team {
for index, team := range config.Check.Team {
if team.Enable {
wg.Add(1)
go xTeam(index)
@ -42,37 +33,22 @@ loop:
}
wg.Wait()
time.Sleep(time.Duration(config.Overall.LoopWait))
time.Sleep(time.Duration(config.Global.Overall.LoopWait))
goto loop
}
func pushToLog(lvlID int, message error) {
lvlName := "??"
switch lvlID {
case 6:
lvlName = "Info"
case 3:
lvlName = "Error"
case 0:
lvlName = "Panic"
}
fmt.Printf("[%s] (%s) %s\n", time.Now().Format(time.RFC3339), lvlName, message)
}
func xTeam(teamID int) bool {
team := &checkList.Team[teamID]
team := &config.Check.Team[teamID]
var failures [][]string
for _, app := range team.App {
pushToLog(6, errors.New("Checking '"+app.Name+"' ..."))
tools.PushToLog(6, errors.New("Checking '"+app.Name+"' ..."))
if _, err := cerebro(app.URL, app.Response); err != nil {
returned := []string{app.Name, err.Error()}
failures = append(failures, returned)
pushToLog(3, err)
tools.PushToLog(3, err)
}
}
@ -87,7 +63,7 @@ func xTeam(teamID int) bool {
func xTeamReport(team string, failures [][]string) (bool, error) {
//var message string {"name":"","error":""}
if config.Reporting.Local {
if config.Global.Reporting.Local {
//report.LocalSave(team, report.LocalBuild(failures))
}
@ -99,7 +75,7 @@ func xTeamReport(team string, failures [][]string) (bool, error) {
}
// for reporting
for _, reportProcess := range errorList.Team[team].Report {
for _, reportProcess := range config.Error.Team[team].Report {
switch reportProcess.Process {
case "smtp":
subject := strings.ReplaceAll(reportProcess.Subject, "[%TEAM]", team)
@ -113,12 +89,12 @@ func xTeamReport(team string, failures [][]string) (bool, error) {
_ = message
//report.byHttp(methods, url, message string)
default:
pushToLog(3, errors.New("Unknow '"+reportProcess.Process+"' reporting process"))
tools.PushToLog(3, errors.New("Unknow '"+reportProcess.Process+"' reporting process"))
}
}
// exec type
/*if config.Reporting.ReportJSON {
/*if config.Global.Reporting.ReportJSON {
jsonFile := "{\"status\":\"error\",\"date\":\""
jsonFile += time.Now().Format(time.RFC3339)
jsonFile += "\",\"listing\":["
@ -158,7 +134,7 @@ func xTeamReport(team string, failures [][]string) (bool, error) {
}
func httpStatus(url string, need int) (bool, error) {
time.Sleep(time.Millisecond * time.Duration(rand.Intn(config.HTTP.MaxWait)))
time.Sleep(time.Millisecond * time.Duration(rand.Intn(config.Global.HTTP.MaxWait)))
client := &http.Client{
CheckRedirect: func(req *http.Request, via []*http.Request) error {

@ -0,0 +1,57 @@
package tools
import (
"fmt"
"time"
)
var logFile string
var logVerbose bool
// InitLogConf : For init local logFile var
func InitLogConf(f string, v bool) {
logFile = f
logVerbose = v
}
// PushToLog : Log manager
func PushToLog(lvlID int, message error) {
if !logVerbose && lvlID == 6 {
return
}
msgout := ""
lvlName := "??"
switch lvlID {
case -1:
lvlName = "Start"
case 6:
lvlName = "Info"
case 3:
fallthrough
default:
lvlName = "Error"
}
msgout = fmt.Sprintf("[%s] (%s) %s", time.Now().Format(time.RFC3339), lvlName, message)
//logToFile(msgout)
fmt.Println(msgout)
}
/*func logToFile(m string) {
f, err := os.OpenFile(logFile, os.O_APPEND|os.O_WRONLY, 0644)
//err != nil {
// panic(err)
//}
if _, err := fmt.Fprintln(f, m); err != nil {
f.Close()
panic(err)
}
if err := f.Close(); err != nil {
panic(err)
}
}*/
Loading…
Cancel
Save