summaryrefslogtreecommitdiff
path: root/config.go
diff options
context:
space:
mode:
authorKatolaZ <katolaz@freaknet.org>2017-08-07 09:55:35 +0100
committerKatolaZ <katolaz@freaknet.org>2017-08-07 09:55:35 +0100
commit096b3fd2867d7bb2d3cd1f85d8806c651b26d625 (patch)
tree4dfcc77e86cc0e667c14a92c43d1785b4cb5e4b8 /config.go
parent802d703f617036ec1d18aa8ecb9678ca3390f68a (diff)
parentd3105e671a19fec1060652531ce783227fb9fab6 (diff)
Merge branch 'devel'
Diffstat (limited to 'config.go')
-rw-r--r--config.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/config.go b/config.go
index 317940a..0071719 100644
--- a/config.go
+++ b/config.go
@@ -10,14 +10,14 @@ import (
// Read a configuration from fname or die
-func readGlobalConfig(fname string) *SCORSHmaster {
+func readGlobalConfig(fname string) *master {
data, err := ioutil.ReadFile(fname)
if err != nil {
log.Fatal("Error while reading file: ", err)
}
- var cfg = new(SCORSHmaster)
+ var cfg = new(master)
// Unmarshal the YAML configuration file into a SCORSHcfg structure
err = yaml.Unmarshal(data, cfg)