chore: Mostly ports SSHBackend.

This commit is contained in:
Tera << 8 2025-01-12 11:35:26 -05:00
parent 0d92d27427
commit 2c6b5eb5b9
Signed by: imterah
GPG key ID: 8FA7DD57BA6CEA37
5 changed files with 98 additions and 62 deletions

View file

@ -21,11 +21,8 @@ type ProxyInstance struct {
Protocol string `json:"protocol"`
}
type WriteLogger struct {
UseError bool
}
type WriteLogger struct{}
// TODO: deprecate UseError switching
func (writer WriteLogger) Write(p []byte) (n int, err error) {
logSplit := strings.Split(string(p), "\n")
@ -34,11 +31,7 @@ func (writer WriteLogger) Write(p []byte) (n int, err error) {
continue
}
if writer.UseError {
log.Errorf("application: %s", line)
} else {
log.Infof("application: %s", line)
}
log.Infof("application: %s", line)
}
return len(p), err
@ -157,7 +150,7 @@ func entrypoint(cCtx *cli.Context) error {
if !command.IsRunning {
var status string
if command.StatusCode == commonbackend.StatusSuccess {
if command.StatusCode() == commonbackend.StatusCode_success {
status = "Success"
} else {
status = "Failure"
@ -236,19 +229,14 @@ func entrypoint(cCtx *cli.Context) error {
log.Debug("entering infinite keepalive loop...")
for {
time.Sleep(1 * time.Second)
}
}
}()
log.Debug("entering execution loop (in main goroutine)...")
stdout := WriteLogger{
UseError: false,
}
stderr := WriteLogger{
UseError: true,
}
logger := WriteLogger{}
for {
log.Info("starting process...")
@ -257,9 +245,7 @@ func entrypoint(cCtx *cli.Context) error {
cmd := exec.Command(executablePath)
cmd.Env = append(cmd.Env, fmt.Sprintf("HERMES_API_SOCK=%s", sockPath), fmt.Sprintf("HERMES_LOG_LEVEL=%s", logLevel))
cmd.Stdout = stdout
cmd.Stderr = stderr
cmd.Stdout, cmd.Stderr = logger, logger
err := cmd.Run()
if err != nil {