mirror of
https://github.com/drakkan/sftpgo.git
synced 2025-11-23 22:04:50 +02:00
web: log an error if loading a required template fails
We used template.Must that panics if an error happen but the error is visible only if sftpgo is started in an interactive way Fixes #82
This commit is contained in:
@@ -13,6 +13,7 @@ import (
|
||||
"encoding/pem"
|
||||
"errors"
|
||||
"fmt"
|
||||
"html/template"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"net"
|
||||
@@ -22,6 +23,7 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/drakkan/sftpgo/logger"
|
||||
"golang.org/x/crypto/ssh"
|
||||
)
|
||||
|
||||
@@ -275,3 +277,14 @@ func CleanSFTPPath(p string) string {
|
||||
}
|
||||
return path.Clean(sftpPath)
|
||||
}
|
||||
|
||||
// LoadTemplate wraps a call to a function returning (*Template, error)
|
||||
// it is just like template.Must but it writes a log before exiting
|
||||
func LoadTemplate(t *template.Template, err error) *template.Template {
|
||||
if err != nil {
|
||||
logger.ErrorToConsole("error loading required template: %v", err)
|
||||
logger.Error(logSender, "", "error loading required template: %v", err)
|
||||
panic(err)
|
||||
}
|
||||
return t
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user