magnus/datagraph
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases 3 Packages Wiki Activity Actions

Added env to scripts

Browse source
This commit is contained in:
Magnus Åhall 2025-08-08 14:44:19 +02:00
parent 9514628710
commit 5145830f65
3 changed files with 60 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

71
script_scheduler.go
View file

@ -7,12 +7,16 @@ import (
// Standard
"bytes"
"database/sql"
"encoding/json"
"fmt"
"os/exec"
"strings"
"time"
)
const ENV_NAME = 0
const SCRIPT_NAME = 1
type ScriptScheduler struct {
EventQueue chan string
}
@ -24,6 +28,7 @@ type ScriptExecution struct {
Source []byte
Data []byte
SSH string
Env []byte
OutputStdout sql.NullString `db:"output_stdout"`
OutputStderr sql.NullString `db:"output_stderr"`
ExitCode sql.NullInt16
@ -70,30 +75,32 @@ func (self ScriptScheduler) HandleNextExecution() { // {{{
se.Update()
logger.Info("script_scheduler", "op", "execute", "id", se.ID)
fname, err := se.GetScriptTempFilename()
if err != nil {
err = werr.Wrap(err)
logger.Error("script_execution", "op", "get_script_temp_filename", "id", se.ID, "error", err)
return
}
err = se.UploadScript(fname)
var fnames []string
fnames, err = se.UploadScript()
if err != nil {
err = werr.Wrap(err)
logger.Error("script_execution", "op", "upload_script", "id", se.ID, "error", err)
return
}
err = se.RunScript(fname)
err = se.UploadEnv(fnames[ENV_NAME], fnames[SCRIPT_NAME])
if err != nil {
err = werr.Wrap(err)
logger.Error("script_execution", "op", "upload_env", "id", se.ID, "error", err)
return
}
err = se.RunScript(fnames[ENV_NAME])
if err != nil {
err = werr.Wrap(err)
logger.Error("script_execution", "op", "run_script", "id", se.ID, "error", err)
return
}
se.SSHCommand([]byte{}, false, fmt.Sprintf("rm %s", fname))
se.SSHCommand([]byte{}, false, fmt.Sprintf("rm %s %s", fnames[ENV_NAME], fnames[SCRIPT_NAME]))
logger.Info("script_scheduler", "op", "handled", "script", fname)
logger.Info("script_scheduler", "op", "handled", "script", fnames[SCRIPT_NAME])
} // }}}
func (self ScriptScheduler) GetNextExecution() (e ScriptExecution, err error) { // {{{
row := db.QueryRowx(`
@ -103,6 +110,7 @@ func (self ScriptScheduler) GetNextExecution() (e ScriptExecution, err error) {
time_end,
data,
ssh,
env,
output_stdout,
output_stderr,
exitcode,
@ -189,20 +197,49 @@ func (se *ScriptExecution) SSHCommand(stdin []byte, log bool, args ...string) (s
return stdout.String(), nil
} // }}}
func (se *ScriptExecution) GetScriptTempFilename() (fname string, err error) { // {{{
fname, err = se.SSHCommand([]byte{}, true, "mktemp -t datagraph.XXXXXX")
func (se *ScriptExecution) UploadScript() (fnames []string, err error) { // {{{
var filenames string
filenames, err = se.SSHCommand(
se.Source,
true,
`sh -c 'RUNENV=$(mktemp -t datagraph.XXXXXX) && SCRIPT=$(mktemp -t datagraph.XXXXXX) && touch $RUNENV $SCRIPT && chmod 700 $RUNENV $SCRIPT && cat >$SCRIPT && echo $RUNENV $SCRIPT'`,
)
if err != nil {
err = werr.Wrap(err)
}
fnames = strings.Split(strings.TrimSpace(filenames), " ")
if len(fnames) != 2 {
err = werr.New("Invalid temp filename count: %d", len(fnames))
return
}
return fnames[:2], nil
} // }}}
func (se *ScriptExecution) UploadEnv(envFname, scriptFname string) (err error) { // {{{
env := make(map[string]string)
err = json.Unmarshal(se.Env, &env)
if err != nil {
err = werr.Wrap(err)
return
}
fname = strings.TrimSpace(fname)
return
} // }}}
func (se *ScriptExecution) UploadScript(fname string) (err error) { // {{{
_, err = se.SSHCommand(se.Source, true, fmt.Sprintf("sh -c 'touch %s && chmod 700 %s && cat >%s'", fname, fname, fname))
var script = "#!/bin/sh\n\n"
for key, val := range env {
script = script + fmt.Sprintf("export %s=\"%s\"\n", key, strings.ReplaceAll(val, `"`, `\"`))
}
script = script + "\n" + scriptFname + "\n"
_, err = se.SSHCommand(
[]byte(script),
true,
fmt.Sprintf(`sh -c 'cat >%s'`, envFname),
)
if err != nil {
err = werr.Wrap(err)
}
return
} // }}}
func (se *ScriptExecution) RunScript(fname string) (err error) { // {{{