lee/OliveTin
1
0
Fork 0
mirror of https://github.com/OliveTin/OliveTin synced 2025-12-12 09:05:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

gofmt

Browse Source
This commit is contained in:
jamesread
2021-07-16 22:12:13 +01:00
parent 48138d00ae
commit fe02130596
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/OliveTin/main.go
View File

@@ -8,9 +8,9 @@ import (
"github.com/jamesread/OliveTin/internal/httpservers" "github.com/jamesread/OliveTin/internal/httpservers"
"github.com/fsnotify/fsnotify"
config "github.com/jamesread/OliveTin/internal/config" config "github.com/jamesread/OliveTin/internal/config"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/fsnotify/fsnotify"
"os" "os"
) )
@@ -44,7 +44,7 @@ func init() {
cfg = config.DefaultConfig() cfg = config.DefaultConfig()
reloadConfig(); reloadConfig()
if logLevel, err := log.ParseLevel(cfg.LogLevel); err == nil { if logLevel, err := log.ParseLevel(cfg.LogLevel); err == nil {
log.SetLevel(logLevel) log.SetLevel(logLevel)
@@ -55,7 +55,7 @@ func init() {
if e.Op == fsnotify.Write { if e.Op == fsnotify.Write {
log.Info("Config file changed:", e.String()) log.Info("Config file changed:", e.String())
reloadConfig(); reloadConfig()
} }
}) })
} }

2
internal/config/config.go
View File

@@ -24,7 +24,7 @@ type Entity struct {
// Config is the global config used through the whole app. // Config is the global config used through the whole app.
type Config struct { type Config struct {
UseSingleHTTPFrontend bool UseSingleHTTPFrontend bool
ThemeName string ThemeName string
ListenAddressSingleHTTPFrontend string ListenAddressSingleHTTPFrontend string
ListenAddressWebUI string ListenAddressWebUI string
ListenAddressRestActions string ListenAddressRestActions string

2
internal/executor/executor.go
View File

@@ -39,7 +39,7 @@ func execAction(cfg *config.Config, actualAction *config.ActionButton) *pb.Start
"timeout": actualAction.Timeout, "timeout": actualAction.Timeout,
}).Infof("Found action") }).Infof("Found action")
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(actualAction.Timeout) * time.Second) ctx, cancel := context.WithTimeout(context.Background(), time.Duration(actualAction.Timeout)*time.Second)
defer cancel() defer cancel()
cmd := exec.CommandContext(ctx, "sh", "-c", actualAction.Shell) cmd := exec.CommandContext(ctx, "sh", "-c", actualAction.Shell)

8
internal/httpservers/webuiServer.go
View File

@@ -11,7 +11,7 @@ import (
) )
type webUISettings struct { type webUISettings struct {
Rest string Rest string
ThemeName string ThemeName string
} }
@@ -34,7 +34,7 @@ func findWebuiDir() string {
return "./webui" // Should not exist return "./webui" // Should not exist
} }
func generateWebUiSettings(w http.ResponseWriter, r *http.Request) { func generateWebUISettings(w http.ResponseWriter, r *http.Request) {
restAddress := "" restAddress := ""
if !cfg.UseSingleHTTPFrontend { if !cfg.UseSingleHTTPFrontend {
@@ -42,7 +42,7 @@ func generateWebUiSettings(w http.ResponseWriter, r *http.Request) {
} }
jsonRet, _ := json.Marshal(webUISettings{ jsonRet, _ := json.Marshal(webUISettings{
Rest: restAddress + "/api/", Rest: restAddress + "/api/",
ThemeName: cfg.ThemeName, ThemeName: cfg.ThemeName,
}) })
@@ -56,7 +56,7 @@ func startWebUIServer(cfg *config.Config) {
mux := http.NewServeMux() mux := http.NewServeMux()
mux.Handle("/", http.FileServer(http.Dir(findWebuiDir()))) mux.Handle("/", http.FileServer(http.Dir(findWebuiDir())))
mux.HandleFunc("/webUiSettings.json", generateWebUiSettings) mux.HandleFunc("/webUiSettings.json", generateWebUISettings)
srv := &http.Server{ srv := &http.Server{
Addr: cfg.ListenAddressWebUI, Addr: cfg.ListenAddressWebUI,