Add logsDir setting and more

 - add logsDir setting in config.json
 - redirect Syncthing and Syncthing-inotify into log files
 - Use autogenerated Syncthing apikey if gui-apikey not set in config.json

1 files changed, 36 insertions, 0 deletions

diff --git a/lib/common/httpclient.go b/lib/common/httpclient.go
index 40d7bc2..72132bf 100644
--- a/lib/common/httpclient.go
+++ b/lib/common/httpclient.go
@@ -9,6 +9,8 @@ import (
 	"io/ioutil"
 	"net/http"
 	"strings"
+
+	"github.com/Sirupsen/logrus"
 )
 
 type HTTPClient struct {
@@ -20,6 +22,7 @@ type HTTPClient struct {
 	id         string
 	csrf       string
 	conf       HTTPClientConfig
+	logger     *logrus.Logger
 }
 
 type HTTPClientConfig struct {
@@ -30,6 +33,13 @@ type HTTPClientConfig struct {
 	CsrfDisable         bool
 }
 
+const (
+	logError   = 1
+	logWarning = 2
+	logInfo    = 3
+	logDebug   = 4
+)
+
 // Inspired by syncthing/cmd/cli
 
 const insecure = false
@@ -64,6 +74,30 @@ func HTTPNewClient(baseURL string, cfg HTTPClientConfig) (*HTTPClient, error) {
 	return &client, nil
 }
 
+// SetLogger Define the logger to use
+func (c *HTTPClient) SetLogger(log *logrus.Logger) {
+	c.logger = log
+}
+
+func (c *HTTPClient) log(level int, format string, args ...interface{}) {
+	if c.logger != nil {
+		switch level {
+		case logError:
+			c.logger.Errorf(format, args...)
+			break
+		case logWarning:
+			c.logger.Warningf(format, args...)
+			break
+		case logInfo:
+			c.logger.Infof(format, args...)
+			break
+		default:
+			c.logger.Debugf(format, args...)
+			break
+		}
+	}
+}
+
 // Send request to retrieve Client id and/or CSRF token
 func (c *HTTPClient) getCidAndCsrf() error {
 	request, err := http.NewRequest("GET", c.endpoint, nil)
@@ -171,6 +205,8 @@ func (c *HTTPClient) handleRequest(request *http.Request) (*http.Response, error
 		request.Header.Set("X-CSRF-Token-"+c.id[:5], c.csrf)
 	}
 
+	c.log(logDebug, "HTTP %s %v", request.Method, request.URL)
+
 	response, err := c.httpClient.Do(request)
 	if err != nil {
 		return nil, err