danvics/watchyourlan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Logs and Conf

Browse source
This commit is contained in:
aceberg 2025-07-26 17:03:27 +07:00
parent 595f04540b
commit 4d820890bb
15 changed files with 94 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/WatchYourLAN/main.go
View file

@ -29,8 +29,8 @@ func main() {
// http.ListenAndServe("localhost:8085", nil)
// }()
// Generate AppConfig
conf.Generate(*dirPtr, *nodePtr)
// Make AppConfig
conf.Start(*dirPtr, *nodePtr)
gdb.Start()

2
frontend/src/functions/api.ts
View file

@ -62,7 +62,7 @@ export const apiPortScan = async (ip:string, port:number) => {
};
export const apiGetHistory = async (mac:string) => {
const url = apiPath+'/api/history/'+mac+'/?num=200';
const url = apiPath+'/api/history/'+mac+'/?num=210';
const hosts = await (await fetch(url)).json();
return hosts;

6
internal/api/api.go
View file

@ -17,7 +17,7 @@ import (
func getAllHosts(c *gin.Context) {
allHosts := gdb.Select("now")
allHosts, _ := gdb.Select("now")
c.IndentedJSON(http.StatusOK, allHosts)
}
@ -34,7 +34,7 @@ func getConfig(c *gin.Context) {
func getHistory(c *gin.Context) {
hosts := gdb.Select("history")
hosts, _ := gdb.Select("history")
c.IndentedJSON(http.StatusOK, hosts)
}
@ -120,7 +120,7 @@ func getStatus(c *gin.Context) {
var status models.Stat
var searchHosts []models.Host
allHosts := gdb.Select("now")
allHosts, _ := gdb.Select("now")
iface := c.Param("iface")
iface = iface[1:]

39
internal/api/config.go
View file

@ -1,13 +1,14 @@
package api
import (
"log/slog"
"net/http"
"strconv"
"github.com/gin-gonic/gin"
"github.com/aceberg/WatchYourLAN/internal/conf"
"github.com/aceberg/WatchYourLAN/internal/gdb"
"github.com/aceberg/WatchYourLAN/internal/routines"
)
func saveConfigHandler(c *gin.Context) {
@ -21,8 +22,6 @@ func saveConfigHandler(c *gin.Context) {
conf.Write(conf.AppConfig)
slog.Info("Writing new config to " + conf.AppConfig.ConfPath)
c.Redirect(http.StatusFound, c.Request.Referer())
}
@ -32,8 +31,14 @@ func saveSettingsHandler(c *gin.Context) {
conf.AppConfig.ArpArgs = c.PostForm("arpargs")
conf.AppConfig.Ifaces = c.PostForm("ifaces")
conf.AppConfig.UseDB = c.PostForm("usedb")
conf.AppConfig.PGConnect = c.PostForm("pgconnect")
useDB := c.PostForm("usedb")
pgConnect := c.PostForm("pgconnect")
if useDB != conf.AppConfig.UseDB || pgConnect != conf.AppConfig.PGConnect {
conf.AppConfig.UseDB = c.PostForm("usedb")
conf.AppConfig.PGConnect = c.PostForm("pgconnect")
gdb.Connect()
}
timeout := c.PostForm("timeout")
trimHist := c.PostForm("trim")
@ -50,11 +55,7 @@ func saveSettingsHandler(c *gin.Context) {
conf.Write(conf.AppConfig)
slog.Debug("ARP_STRS", "", conf.AppConfig.ArpArgs)
slog.Info("Writing new config to " + conf.AppConfig.ConfPath)
// TODO:
// updateRoutines() // routines-upd.go
routines.ScanRestart()
c.Redirect(http.StatusFound, c.Request.Referer())
}
@ -65,24 +66,14 @@ func saveInfluxHandler(c *gin.Context) {
conf.AppConfig.InfluxToken = c.PostForm("token")
conf.AppConfig.InfluxOrg = c.PostForm("org")
conf.AppConfig.InfluxBucket = c.PostForm("bucket")
enable := c.PostForm("enable")
skip := c.PostForm("skip")
if enable == "on" {
conf.AppConfig.InfluxEnable = true
} else {
conf.AppConfig.InfluxEnable = false
}
if skip == "on" {
conf.AppConfig.InfluxSkipTLS = true
} else {
conf.AppConfig.InfluxSkipTLS = false
}
conf.AppConfig.InfluxEnable = enable == "on"
conf.AppConfig.InfluxSkipTLS = skip == "on"
conf.Write(conf.AppConfig)
slog.Info("Writing new config to " + conf.AppConfig.ConfPath)
c.Redirect(http.StatusFound, c.Request.Referer())
}
@ -93,7 +84,5 @@ func savePrometheusHandler(c *gin.Context) {
conf.Write(conf.AppConfig)
slog.Info("Writing new config to " + conf.AppConfig.ConfPath)
c.Redirect(http.StatusFound, c.Request.Referer())
}

4
internal/conf/generate.go → internal/conf/start.go
View file

@ -8,8 +8,8 @@ import (
// AppConfig - app config
var AppConfig models.Conf
// Generate - initial config
func Generate(dirPath, nodePath string) {
// Start - initial config
func Start(dirPath, nodePath string) {
confPath := dirPath + "/config_v2.yaml"
check.Path(confPath)

4
internal/conf/write.go
View file

@ -1,6 +1,8 @@
package conf
import (
"log/slog"
"github.com/spf13/viper"
"github.com/aceberg/WatchYourLAN/internal/check"
@ -10,6 +12,8 @@ import (
// Write - write config to file
func Write(config models.Conf) {
slog.Info("Writing new config to " + config.ConfPath)
viper.SetConfigFile(config.ConfPath)
viper.SetConfigType("yaml")

9
internal/gdb/select.go
View file

@ -1,16 +1,17 @@
package gdb
import (
"github.com/aceberg/WatchYourLAN/internal/check"
"github.com/aceberg/WatchYourLAN/internal/models"
)
// Select - get all hosts
func Select(table string) (dbHosts []models.Host) {
func Select(table string) (dbHosts []models.Host, ok bool) {
tab := db.Table(table)
tab.Find(&dbHosts)
err := tab.Find(&dbHosts).Error
return dbHosts
return dbHosts, !check.IfError(err)
}
// SelectByID - get host by ID
@ -31,7 +32,7 @@ func SelectByMAC(mac string) (hosts []models.Host) {
return hosts
}
// SelectByDate - get all hosts by MAC
// SelectByDate - get all hosts by MAC and DATE
func SelectByDate(mac, date string) (hosts []models.Host) {
tab := db.Table("history")

55
internal/gdb/start.go
View file

@ -19,12 +19,12 @@ import (
)
var db *gorm.DB
var gormConf *gorm.Config
// Start working with DB
func Start() {
var tab *gorm.DB
var err error
var pgFail bool
newLogger := logger.New(
log.New(os.Stdout, "\r\n", log.LstdFlags),
@ -35,7 +35,7 @@ func Start() {
Colorful: true,
},
)
gormConf := &gorm.Config{
gormConf = &gorm.Config{
Logger: newLogger,
NamingStrategy: schema.NamingStrategy{
NoLowerCase: true,
@ -43,26 +43,7 @@ func Start() {
},
}
// Choose DB and connect
if conf.AppConfig.UseDB == "postgres" {
db, err = gorm.Open(postgres.Open(conf.AppConfig.PGConnect), gormConf)
if err != nil {
pgFail = true
slog.Error("PostgreSQL connection error:", "err", err)
slog.Warn("Falling back to SQLite")
}
}
if pgFail || conf.AppConfig.UseDB != "postgres" {
db, err = gorm.Open(sqlite.Open(conf.AppConfig.DBPath), gormConf)
check.IfError(err)
db.Exec("PRAGMA journal_mode = wal;")
db.Exec("PRAGMA busy_timeout = 5000;")
}
Connect()
// Migrate the schema
tab = db.Table("now")
@ -73,3 +54,33 @@ func Start() {
err = tab.AutoMigrate(&models.Host{})
check.IfError(err)
}
// Connect - choose DB and connect
func Connect() {
var err error
var pgFail bool
if conf.AppConfig.UseDB == "postgres" {
db, err = gorm.Open(postgres.Open(conf.AppConfig.PGConnect), gormConf)
if err != nil {
pgFail = true
slog.Error("PostgreSQL connection error:", "err", err)
slog.Warn("Falling back to SQLite")
} else {
slog.Info("Connected to DB: PostgreSQL")
}
}
if pgFail || conf.AppConfig.UseDB != "postgres" {
db, err = gorm.Open(sqlite.Open(conf.AppConfig.DBPath), gormConf)
if !check.IfError(err) {
slog.Info("Connected to DB: SQLite")
db.Exec("PRAGMA journal_mode = wal;")
db.Exec("PRAGMA busy_timeout = 5000;")
}
}
}

8
internal/prometheus/prometheus.go
View file

@ -4,18 +4,20 @@ import (
"net/http"
"strconv"
"github.com/aceberg/WatchYourLAN/internal/models"
"github.com/gin-gonic/gin"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/aceberg/WatchYourLAN/internal/conf"
"github.com/aceberg/WatchYourLAN/internal/models"
)
// Handler - display Prometheus metrics
func Handler(enabled bool) func(c *gin.Context) {
func Handler() func(c *gin.Context) {
h := promhttp.Handler()
return func(c *gin.Context) {
if !enabled {
if !conf.AppConfig.PrometheusEnable {
c.AbortWithStatus(http.StatusNotFound)
return
}

8
internal/routines/restart-scan.go
View file

@ -15,7 +15,7 @@ func ScanRestart() {
close(quitScan)
slog.Debug("Restarting scan routine")
slog.Info("Restarting scan routine")
setLogLevel()
quitScan = make(chan bool)
@ -25,18 +25,16 @@ func ScanRestart() {
func setLogLevel() {
var level slog.Level
slog.Info("Log level: " + conf.AppConfig.LogLevel)
switch conf.AppConfig.LogLevel {
case "debug":
slog.Info("Log level=DEBUG")
level = slog.LevelDebug
case "info":
slog.Info("Log level=INFO")
level = slog.LevelInfo
case "warn":
slog.Info("Log level=WARN")
level = slog.LevelWarn
case "error":
slog.Info("Log level=ERROR")
level = slog.LevelError
default:
slog.Error("Invalid log level. Setting default level INFO")

6
internal/routines/scan-routine.go
View file

@ -47,7 +47,11 @@ func startScan(quit chan bool) {
func compareHosts(foundHostsMap map[string]models.Host) {
allHosts := gdb.Select("now")
allHosts, ok := gdb.Select("now")
if !ok {
return
}
for _, aHost := range allHosts {
fHost, exists := foundHostsMap[aHost.Mac]

5
internal/routines/trim-history.go
View file

@ -10,8 +10,11 @@ import (
// HistoryTrim - routine for History
func HistoryTrim() {
go func() {
for {
time.Sleep(time.Duration(1) * time.Hour) // Every hour
hours := conf.AppConfig.TrimHist
nowMinus := time.Now().Add(-time.Duration(hours) * time.Hour)
date := nowMinus.Format("2006-01-02 15:04:05")
@ -20,8 +23,6 @@ func HistoryTrim() {
n := gdb.DeleteOldHistory(date)
slog.Info("Removed records from History", "n", n)
time.Sleep(time.Duration(1) * time.Hour) // Every hour
}
}()
}

2
internal/web/public/assets/index.js
View file

File diff suppressed because one or more lines are too long

2
internal/web/public/version
View file

@ -1 +1 @@
VERSION=2.1.2
VERSION=2.1.3

19
internal/web/webgui.go
View file

@ -25,19 +25,24 @@ var pubFS embed.FS
// Gui - start web server
func Gui() {
const (
colorCyan = "\033[36m"
colorReset = "\033[0m"
)
file, err := pubFS.ReadFile("public/version")
check.IfError(err)
conf.AppConfig.Version = string(file)[8:]
slog.Info("Config dir", "path", conf.AppConfig.DirPath)
address := conf.AppConfig.Host + ":" + conf.AppConfig.Port
slog.Info("=================================== ")
slog.Info("Version: " + conf.AppConfig.Version)
slog.Info("Web GUI at http://" + address)
slog.Info("=================================== ")
slog.Info(colorCyan + "\n=================================== " +
"\n WatchYourLAN Version: " + conf.AppConfig.Version +
"\n Config dir: " + conf.AppConfig.DirPath +
"\n Default DB: " + conf.AppConfig.UseDB +
"\n Log level: " + conf.AppConfig.LogLevel +
"\n Web GUI: http://" + address +
"\n=================================== " + colorReset)
gin.SetMode(gin.ReleaseMode)
router := gin.New()
@ -52,7 +57,7 @@ func Gui() {
router.GET("/config", indexHandler) // index.go
router.GET("/history", indexHandler) // index.go
router.GET("/host/*any", indexHandler) // index.go
router.GET("/metrics", prometheus.Handler(conf.AppConfig.PrometheusEnable))
router.GET("/metrics", prometheus.Handler())
api.Routes(router)