diff --git a/frontend/src/pages/Service.vue b/frontend/src/pages/Service.vue index 9462cb9c..d6a89b15 100644 --- a/frontend/src/pages/Service.vue +++ b/frontend/src/pages/Service.vue @@ -58,6 +58,12 @@ +
+
+ +
+
+
diff --git a/source/source.go b/source/source.go index b124e37d..e829d169 100644 --- a/source/source.go +++ b/source/source.go @@ -97,7 +97,7 @@ func UsingAssets(folder string) bool { } if err := CompileSASS(); err != nil { //CopyToPublic(CssBox, folder+"/css", "base.css") - log.Warnln("Default 'base.css' was insert because SASS did not work.") + log.Warn(errors.Wrap(err, "Default 'base.css' was insert because SASS did not work.")) return true } return true diff --git a/utils/file.go b/utils/file.go index 1019b6fd..36698d4b 100644 --- a/utils/file.go +++ b/utils/file.go @@ -17,7 +17,7 @@ func DeleteDirectory(directory string) error { // CreateDirectory("assets") func CreateDirectory(directory string) error { Log.Debugln("creating directory: " + directory) - if err := os.Mkdir(directory, os.ModePerm); err != os.ErrExist { + if err := os.Mkdir(directory, os.FileMode(0755)); err != os.ErrExist { return err } return nil @@ -68,7 +68,7 @@ func RenameDirectory(fromDir string, toDir string) error { // SaveFile will create a new file with data inside it // SaveFile("newfile.json", []byte('{"data": "success"}') func SaveFile(filename string, data []byte) error { - err := ioutil.WriteFile(filename, data, os.ModePerm) + err := ioutil.WriteFile(filename, data, os.FileMode(0755)) return err } diff --git a/utils/utils.go b/utils/utils.go index a5bec68b..f0214c1f 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -172,14 +172,12 @@ func HttpRequest(endpoint, method string, content interface{}, headers []string, if req, err = http.NewRequest(method, endpoint, body); err != nil { return nil, nil, err } - req.Header.Set("User-Agent", "Statping") - if content != nil { - req.Header.Set("Content-Type", content.(string)) - } - // set default headers so end user can overwrite them if needed req.Header.Set("User-Agent", "Statping") req.Header.Set("Statping-Version", Version) + if content != nil { + req.Header.Set("Content-Type", content.(string)) + } verifyHost := req.URL.Hostname() for _, h := range headers { @@ -197,7 +195,6 @@ func HttpRequest(endpoint, method string, content interface{}, headers []string, } var resp *http.Response - dialer := &net.Dialer{ Timeout: timeout, KeepAlive: timeout, @@ -219,7 +216,7 @@ func HttpRequest(endpoint, method string, content interface{}, headers []string, return dialer.DialContext(ctx, network, addr) }, } - if Params.IsSet("HTTP_PROXY") { + if Params.GetString("HTTP_PROXY") != "" { proxyUrl, err := url.Parse(Params.GetString("HTTP_PROXY")) if err != nil { return nil, nil, err