uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-14 20:59:53 +05:00
Code Issues Packages Projects Releases Wiki Activity

Update configs to include root_dir in path

Browse Source
This commit is contained in:
TeoV
2020-09-07 10:41:30 +03:00
committed by Dan Christian Bogos
parent 21e08d5a92
commit 19f773289d
2 changed files with 68 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
config/config.go
View File

@@ -24,7 +24,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"net/http"
"net/url"
"os"
@@ -1640,59 +1639,3 @@ func (cfg *CGRConfig) AsMapInterface(separator string) map[string]interface{} {
utils.ErsCfg: cfg.ersCfg.AsMapInterface(separator),
}
}
// RegisterConfigs handler for httpServer to register the configs
func HandlerConfigS(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
w.Header().Set("Content-Type", "application/json")
// take out the /configs prefix and use the rest of url as path
path := strings.TrimPrefix(r.URL.Path, "/configs")
fi, err := os.Stat(path)
if err != nil {
if os.IsNotExist(err) {
w.WriteHeader(404)
} else {
w.WriteHeader(500)
}
fmt.Fprintf(w, err.Error())
return
}
switch mode := fi.Mode(); {
case mode.IsDir():
handleConfigSFolder(path, w)
case mode.IsRegular():
handleConfigSFile(path, w)
}
return
}
func handleConfigSFolder(path string, w http.ResponseWriter) {
// if the path is a directory, read the directory, construct the config and load it in memory
cfg, err := NewCGRConfigFromPath(path)
if err != nil {
w.WriteHeader(500)
fmt.Fprintf(w, err.Error())
return
}
// convert the config into a json and send it
if _, err := w.Write([]byte(utils.ToJSON(cfg.AsMapInterface(cfg.generalCfg.RSRSep)))); err != nil {
utils.Logger.Warning(fmt.Sprintf("<%s> Failed to write resonse because: %s",
utils.ConfigSv1, err))
}
return
}
func handleConfigSFile(path string, w http.ResponseWriter) {
// if the config is a file read the file and send it directly
dat, err := ioutil.ReadFile(path)
if err != nil {
w.WriteHeader(500)
fmt.Fprintf(w, err.Error())
return
}
if _, err := w.Write(dat); err != nil {
utils.Logger.Warning(fmt.Sprintf("<%s> Failed to write resonse because: %s",
utils.ConfigSv1, err))
}
return
}

68
config/configs.go
View File

@@ -15,6 +15,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package config
import (
"fmt"
"io/ioutil"
"net/http"
"os"
"path"
"strings"
"github.com/cgrates/cgrates/utils"
)
// ConfigSCfg config for listening over http
type ConfigSCfg struct {
Enabled bool
@@ -38,3 +49,60 @@ func (cScfg *ConfigSCfg) loadFromJsonCfg(jsnCfg *ConfigSCfgJson) (err error) {
}
return
}
// RegisterConfigs handler for httpServer to register the configs
func HandlerConfigS(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
w.Header().Set("Content-Type", "application/json")
// take out the /configs prefix and use the rest of url as path
pth := strings.TrimPrefix(r.URL.Path, "/configs")
pth = path.Join(CgrConfig().ConfigSCfg().RootDir, pth)
fi, err := os.Stat(pth)
if err != nil {
if os.IsNotExist(err) {
w.WriteHeader(404)
} else {
w.WriteHeader(500)
}
fmt.Fprintf(w, err.Error())
return
}
switch mode := fi.Mode(); {
case mode.IsDir():
handleConfigSFolder(pth, w)
case mode.IsRegular():
handleConfigSFile(pth, w)
}
return
}
func handleConfigSFolder(path string, w http.ResponseWriter) {
// if the path is a directory, read the directory, construct the config and load it in memory
cfg, err := NewCGRConfigFromPath(path)
if err != nil {
w.WriteHeader(500)
fmt.Fprintf(w, err.Error())
return
}
// convert the config into a json and send it
if _, err := w.Write([]byte(utils.ToJSON(cfg.AsMapInterface(cfg.generalCfg.RSRSep)))); err != nil {
utils.Logger.Warning(fmt.Sprintf("<%s> Failed to write resonse because: %s",
utils.ConfigSv1, err))
}
return
}
func handleConfigSFile(path string, w http.ResponseWriter) {
// if the config is a file read the file and send it directly
dat, err := ioutil.ReadFile(path)
if err != nil {
w.WriteHeader(500)
fmt.Fprintf(w, err.Error())
return
}
if _, err := w.Write(dat); err != nil {
utils.Logger.Warning(fmt.Sprintf("<%s> Failed to write resonse because: %s",
utils.ConfigSv1, err))
}
return
}