diff --git a/script_scheduler.go b/script_scheduler.go index 808548e..96878a7 100644 --- a/script_scheduler.go +++ b/script_scheduler.go @@ -22,7 +22,7 @@ type ScriptExecution struct { TimeStart sql.NullTime `db:"time_start"` TimeEnd sql.NullTime `db:"time_end"` Source []byte - Data string + Data []byte SSH string OutputStdout sql.NullString `db:"output_stdout"` OutputStderr sql.NullString `db:"output_stderr"` @@ -84,6 +84,13 @@ func (self ScriptScheduler) HandleNextExecution() { // {{{ return } + err = se.RunScript(fname) + 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)) logger.Info("script_scheduler", "op", "handled", "script", fname) @@ -192,7 +199,14 @@ func (se *ScriptExecution) GetScriptTempFilename() (fname string, err error) { / 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 && %s'", fname, fname, fname, fname)) + _, err = se.SSHCommand(se.Source, true, fmt.Sprintf("sh -c 'touch %s && chmod 700 %s && cat >%s'", fname, fname, fname)) + if err != nil { + err = werr.Wrap(err) + } + return +} // }}} +func (se *ScriptExecution) RunScript(fname string) (err error) { // {{{ + _, err = se.SSHCommand(se.Data, true, fname) if err != nil { err = werr.Wrap(err) } diff --git a/static/css/main.css b/static/css/main.css index 06ebd6f..ed55cbb 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -62,13 +62,14 @@ button { padding: 16px 32px; } #menu .item { + font-size: 1.1em; cursor: pointer; } #menu .item.selected { font-weight: bold; } #logo img { - height: 96px; + height: 64px; margin-right: 32px; } #nodes { diff --git a/static/less/main.less b/static/less/main.less index 3f4d140..c9a29bc 100644 --- a/static/less/main.less +++ b/static/less/main.less @@ -79,6 +79,7 @@ button { } .item { + font-size: 1.1em; cursor: pointer; &.selected { @@ -89,7 +90,7 @@ button { #logo { img { - height: 96px; + height: 64px; margin-right: 32px; } }