Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
6d2ab00fa7
|
|||
|
09e4a5d646
|
|||
|
904f585c4d
|
@@ -4,7 +4,6 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
|
||||||
"net"
|
"net"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
@@ -60,7 +59,6 @@ func setupSshServer(host string, port string, host_key_path string, users map[st
|
|||||||
if err := cmd.Run(); err != nil {
|
if err := cmd.Run(); err != nil {
|
||||||
wish.Fatalln(s, err)
|
wish.Fatalln(s, err)
|
||||||
}
|
}
|
||||||
io.Copy(os.Stderr, s.Stderr())
|
|
||||||
next(s)
|
next(s)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -73,9 +71,6 @@ func setupSshServer(host string, port string, host_key_path string, users map[st
|
|||||||
// Serve an ssh application using the provided arguments.
|
// Serve an ssh application using the provided arguments.
|
||||||
func Serve(host string, port string, host_key_path string, users map[string]string, name string, args []string) {
|
func Serve(host string, port string, host_key_path string, users map[string]string, name string, args []string) {
|
||||||
setupLogging()
|
setupLogging()
|
||||||
log.Info("Running Serve (v2.7)...") // TODO make version string automatically the git tag (otherwise commit-hash)?
|
|
||||||
defer log.Info("Stopping Serve...")
|
|
||||||
|
|
||||||
srv, err := setupSshServer(host, port, host_key_path, users, name, args)
|
srv, err := setupSshServer(host, port, host_key_path, users, name, args)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Could not start server", "error", err)
|
log.Error("Could not start server", "error", err)
|
||||||
|
|||||||
Reference in New Issue
Block a user