mod: revert changes
Logging will be done through `zlog` dependency for *zig* based applications. `zlog` shall be configured such that it should not log to *stderr* and should use the "log" file instead. This way the log file is both used by `serve` and by the running application. Logging could also happen in a different file and is independent of the logging of `serve`, however for now I want the logging to also happen in the same file.
This commit is contained in:
@@ -56,11 +56,6 @@ func setupSshServer(host string, port string, host_key_path string, users map[st
|
|||||||
func(next ssh.Handler) ssh.Handler {
|
func(next ssh.Handler) ssh.Handler {
|
||||||
return func(s ssh.Session) {
|
return func(s ssh.Session) {
|
||||||
cmd := wish.Command(s, name, args...)
|
cmd := wish.Command(s, name, args...)
|
||||||
file, err := os.OpenFile("log", os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600)
|
|
||||||
if err != nil {
|
|
||||||
wish.Fatalln(s, err)
|
|
||||||
}
|
|
||||||
cmd.SetStderr(file)
|
|
||||||
if err := cmd.Run(); err != nil {
|
if err := cmd.Run(); err != nil {
|
||||||
wish.Fatalln(s, err)
|
wish.Fatalln(s, err)
|
||||||
}
|
}
|
||||||
@@ -76,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.8)...") // 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