9 Commits

Author SHA1 Message Date
Adrian Zürcher
20912ba17c add first supervisor process 2025-08-05 17:17:55 +02:00
Adrian Zürcher
dd5ebb60fd move template in bin 2025-08-05 17:17:02 +02:00
Adrian Zürcher
0e8864d4da remove sudo
All checks were successful
Build Process Supervisor / build (amd64, .exe, windows) (push) Successful in 2m32s
Build Process Supervisor / build (amd64, , linux) (push) Successful in 2m45s
Build Process Supervisor / build (arm, 6, , linux) (push) Successful in 2m32s
Build Process Supervisor / build (arm64, , linux) (push) Successful in 2m34s
2025-08-05 15:50:52 +02:00
Adrian Zürcher
490fae7d5b fix install zip
Some checks failed
Build Process Supervisor / build (amd64, , linux) (push) Failing after 16s
Build Process Supervisor / build (amd64, .exe, windows) (push) Failing after 16s
Build Process Supervisor / build (arm64, , linux) (push) Has been cancelled
Build Process Supervisor / build (arm, 6, , linux) (push) Has been cancelled
2025-08-05 15:48:01 +02:00
Adrian Zürcher
ca9d8af13f add install zip
Some checks failed
Build Process Supervisor / build (amd64, , linux) (push) Failing after 1m19s
Build Process Supervisor / build (amd64, .exe, windows) (push) Failing after 1m16s
Build Process Supervisor / build (arm, 6, , linux) (push) Failing after 1m17s
Build Process Supervisor / build (arm64, , linux) (push) Has been cancelled
2025-08-05 15:44:09 +02:00
Adrian Zürcher
2537d5f1c8 second fix wrong go version
Some checks failed
Build Process Supervisor / build (amd64, .exe, windows) (push) Failing after 6m39s
Build Process Supervisor / build (amd64, , linux) (push) Failing after 6m52s
Build Process Supervisor / build (arm, 6, , linux) (push) Failing after 6m42s
Build Process Supervisor / build (arm64, , linux) (push) Failing after 6m33s
2025-08-05 15:29:28 +02:00
Adrian Zürcher
79ad631494 fix wrong go version
Some checks failed
Build Process Supervisor / build (amd64, , linux) (push) Failing after 22s
Build Process Supervisor / build (amd64, .exe, windows) (push) Failing after 23s
Build Process Supervisor / build (arm, 6, , linux) (push) Failing after 22s
Build Process Supervisor / build (arm64, , linux) (push) Failing after 22s
2025-08-05 15:23:16 +02:00
Adrian Zürcher
a0046e1848 try to cache go
Some checks failed
Build Process Supervisor / build (amd64, , linux) (push) Failing after 2m52s
Build Process Supervisor / build (amd64, .exe, windows) (push) Failing after 2m53s
Build Process Supervisor / build (arm, 6, , linux) (push) Failing after 26s
Build Process Supervisor / build (arm64, , linux) (push) Failing after 26s
2025-08-05 15:17:58 +02:00
Adrian Zürcher
d5f314dad2 fix yaml
Some checks failed
Build Process Supervisor / build (amd64, , linux) (push) Successful in 20m56s
Build Process Supervisor / build (arm, 6, , linux) (push) Has been cancelled
Build Process Supervisor / build (arm64, , linux) (push) Has been cancelled
Build Process Supervisor / build (amd64, .exe, windows) (push) Has been cancelled
2025-08-05 14:16:20 +02:00
6 changed files with 176 additions and 35 deletions

View File

@@ -30,29 +30,53 @@ jobs:
ext: ""
steps:
- name: Install zip
run: |
apt-get update && apt-get install -y zip
- name: Checkout repo
uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: '1.24.5'
- name: Ensure latest Go is installed in /data/go
run: |
export GOROOT=/data/go/go
export PATH=$GOROOT/bin:$PATH
export GOCACHE=/data/gocache
export GOMODCACHE=/data/gomodcache
mkdir -p $GOCACHE $GOMODCACHE
- name: Cache Go modules
uses: actions/cache@v4
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
if [ ! -x "$GOROOT/bin/go" ]; then
echo "Go not found in $GOROOT, downloading latest stable..."
GO_VERSION=$(curl -s https://go.dev/VERSION?m=text | head -n1)
echo "Latest version is $GO_VERSION"
mkdir -p /data/go
curl -sSL "https://go.dev/dl/${GO_VERSION}.linux-amd64.tar.gz" -o /tmp/go.tar.gz
tar -C /data/go -xzf /tmp/go.tar.gz
else
echo "Using cached Go from $GOROOT"
fi
go version
- name: Download Go dependencies
run: go mod download
- name: Build binaries
run: |
export GOROOT=/data/go/go
export PATH=$GOROOT/bin:$PATH
export GOCACHE=/data/gocache
export GOMODCACHE=/data/gomodcache
mkdir -p $GOCACHE $GOMODCACHE
go mod download
- name: Build binary
run: |
export GOROOT=/data/go/go
export PATH=$GOROOT/bin:$PATH
export GOCACHE=/data/gocache
export GOMODCACHE=/data/gomodcache
mkdir -p $GOCACHE $GOMODCACHE
OUTPUT="bin/${APP_NAME}-${{ matrix.os }}-${{ matrix.arch }}"
if [ -n "${{ matrix.arm_version }}" ]; then
OUTPUT="${OUTPUT}v${{ matrix.arm_version }}"
@@ -63,8 +87,12 @@ jobs:
GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} go build -ldflags="-s -w" -trimpath -o "$OUTPUT"
shell: bash
- name: Upload artifacts
- name: Zip artifact
run: |
zip bin/${{ env.APP_NAME }}-${{ matrix.os }}-${{ matrix.arch }}.zip bin/${{ env.APP_NAME }}-*
- name: Upload zipped artifact
uses: actions/upload-artifact@v3
with:
name: ${{ env.APP_NAME }}-${{ matrix.os }}-${{ matrix.arch }}${{ matrix.arm_version && format('v{0}', matrix.arm_version) || '' }}${{ matrix.ext }}
path: bin/${{ env.APP_NAME }}-${{ matrix.os }}-${{ matrix.arch }}${{ matrix.arm_version && format('v{0}', matrix.arm_version) || '' }}${{ matrix.ext }}
name: ${{ env.APP_NAME }}-${{ matrix.os }}-${{ matrix.arch }}
path: bin/${{ env.APP_NAME }}-${{ matrix.os }}-${{ matrix.arch }}.zip

10
dist/supervisorTemplate.json vendored Normal file
View File

@@ -0,0 +1,10 @@
{
"processes":[{
"name":"Database DBM",
"executePath":"dist/test-windows-amd64.exe",
"workingDirectory":".",
"startDelay":2,
"priority":0
}
]
}

View File

@@ -1,6 +1,7 @@
package handlers
import (
"embed"
"encoding/json"
"html/template"
"net/http"
@@ -8,16 +9,18 @@ import (
)
type HTopHandler struct {
Table *models.HtopTable
Table *models.HtopTable
templates *embed.FS
}
func NewHTopHandler() (*HTopHandler, error) {
func NewHTopHandler(templates *embed.FS) (*HTopHandler, error) {
table, err := models.NewTable()
if err != nil {
return nil, err
}
return &HTopHandler{
Table: table,
Table: table,
templates: templates,
}, nil
}
@@ -38,14 +41,18 @@ func (h *HTopHandler) UpdateHTop(w http.ResponseWriter, r *http.Request) {
// Detect HTMX request via the HX-Request header
if r.Header.Get("HX-Request") == "true" {
tmpl := template.Must(
template.New("table.html").Funcs(funcMap).ParseFiles("templates/htop/table.html"),
template.New("table.html").Funcs(funcMap).ParseFS(
h.templates,
"templates/htop/table.html",
),
)
tmpl.Execute(w, h.Table)
return
}
tmpl := template.Must(
template.New("htop.html").Funcs(funcMap).ParseFiles(
template.New("htop.html").Funcs(funcMap).ParseFS(
h.templates,
"templates/htop/htop.html",
"templates/htop/table.html",
),

View File

@@ -1,17 +1,47 @@
package handlers
import (
"embed"
"fmt"
"html/template"
"net/http"
"os"
"processSupervisor/models"
)
type MainPage struct {
templates *embed.FS
Supervisor *models.Supervisor
}
func UpdateMainPage(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "text/html; charset=utf-8")
func NewMainPage(templates *embed.FS) (*MainPage, error) {
fmt.Println(10)
fmt.Println(os.Getwd())
var supervisor models.Supervisor
if _, err := os.Stat("cfg/"); err != nil {
s, err := models.ReadTemplate("dist/supervisorTemplate.json")
if err != nil {
return nil, err
}
supervisor = s
}
fmt.Println(11)
if err := supervisor.StartProcesses(); err != nil {
return nil, err
}
return &MainPage{
templates: templates,
Supervisor: &supervisor,
}, nil
}
func (m *MainPage) UpdateMainPage(w http.ResponseWriter, r *http.Request) {
tmpl := template.Must(
template.New("index.html").ParseFiles("templates/index.html"),
template.New("index.html").ParseFS(
m.templates,
"templates/index.html",
),
)
tmpl.Execute(w, nil)
}

25
main.go
View File

@@ -1,6 +1,7 @@
package main
import (
"embed"
"flag"
"fmt"
"log"
@@ -8,24 +9,32 @@ import (
"processSupervisor/handlers"
)
//go:embed templates/*.html templates/*/*.html
var templatesFS embed.FS
//go:embed static
var staticFS embed.FS
func main() {
port := flag.Uint("port", 9400, "listenig port")
flag.Parse()
htop, err := handlers.NewHTopHandler()
port := flag.Uint("port", 9400, "listening port")
htop, err := handlers.NewHTopHandler(&templatesFS)
if err != nil {
panic(err)
}
fs := http.FileServer(http.Dir("static"))
http.Handle("/static/", http.StripPrefix("/static/", fs))
mianPage, err := handlers.NewMainPage(&templatesFS)
if err != nil {
panic(err)
}
http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.FS(staticFS))))
http.HandleFunc("/taskmanager/htop", htop.UpdateHTop)
http.HandleFunc("/", handlers.UpdateMainPage)
http.HandleFunc("/", mianPage.UpdateMainPage)
http.HandleFunc("/taskmanager/kill", handlers.KillHandler)
http.HandleFunc("/taskmanager/usage", handlers.UsageHandler)
log.Printf("Listening on http://localhost:%d/taskmanager/htop\n", *port)
log.Printf("Listening on http://localhost:%d\n", *port)
log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", *port), nil))
}

57
models/supervisor.go Normal file
View File

@@ -0,0 +1,57 @@
package models
import (
"encoding/json"
"fmt"
"os"
"os/exec"
"sort"
)
type Supervisor struct {
Processes []*SupervisorProcess `json:"processes"`
}
type SupervisorProcess struct {
Name string `json:"name"`
ExecutePath string `json:"executePath"`
WorkingDirectory string `json:"workingDirectory,omitempty"`
StartDelay int `json:"startDelay,omitempty"`
Priority int `json:"priority,omitempty"`
Arguments []string `json:"arguments,omitempty"`
process *exec.Cmd `json:"-"`
}
func ReadTemplate(path string) (supervisor Supervisor, err error) {
content, err := os.ReadFile(path)
if err != nil {
return
}
err = json.Unmarshal(content, &supervisor)
return
}
func (s *Supervisor) StartProcesses() error {
sort.Slice(s.Processes, func(i, j int) bool {
return s.Processes[i].Priority < s.Processes[j].Priority
})
for _, p := range s.Processes {
go func() {
p.process = exec.Command(p.ExecutePath, p.Arguments...)
//cmd.Env = append(cmd.Env, "MY_VAR=some_value")
p.process.Dir = p.WorkingDirectory
output, err := p.process.Output()
if err != nil {
fmt.Println("Error:", err)
}
fmt.Println("Output:", string(output))
}()
}
fmt.Println(3)
return nil
}