summaryrefslogtreecommitdiff
path: root/config.go
diff options
context:
space:
mode:
authorKatolaZ <katolaz@freaknet.org>2017-07-13 08:06:00 +0100
committerKatolaZ <katolaz@freaknet.org>2017-07-13 08:06:00 +0100
commited637037b75cb5dfe1b49e776956fa6ab3632b68 (patch)
treee15ca421f15878aff4d378e186baeed1a40c6acb /config.go
parent00c61083d7139f19b8d99dfc7ac6d7e22c4f9a78 (diff)
temporarily removed variable expansions in scorsh.cfg
Diffstat (limited to 'config.go')
-rw-r--r--config.go29
1 files changed, 12 insertions, 17 deletions
diff --git a/config.go b/config.go
index e64a35c..112b158 100644
--- a/config.go
+++ b/config.go
@@ -10,7 +10,6 @@ import (
"os"
)
-
// Read a configuration from fname or die
func ReadGlobalConfig(fname string) *SCORSHmaster {
@@ -20,11 +19,10 @@ func ReadGlobalConfig(fname string) *SCORSHmaster {
log.Fatal("Error while reading file: ", err)
}
-
var cfg *SCORSHmaster
cfg = new(SCORSHmaster)
-
+
// Unmarshal the YAML configuration file into a SCORSHcfg structure
err = yaml.Unmarshal(data, cfg)
if err != nil {
@@ -33,21 +31,12 @@ func ReadGlobalConfig(fname string) *SCORSHmaster {
fmt.Printf("%s", cfg)
- // If the user has not set a spooldir, crash loudly
- if cfg.Spooldir == "" {
- log.Fatal("No spooldir defined in ", fname, ". Exiting\n")
- }
-
- // Check if the user has set a custom logprefix
-
- // Check if the user wants to redirect the logs to a file
if cfg.Logfile != "" {
- log.Printf("Opening log file: %s\n", cfg.Logfile)
f, err := os.OpenFile(cfg.Logfile, os.O_APPEND|os.O_CREATE|os.O_RDWR, 0600)
if err != nil {
- log.SetOutput(io.Writer(f))
- } else {
log.Fatal("Error opening logfile: ", cfg.Logfile, err)
+ } else {
+ log.SetOutput(io.Writer(f))
}
}
@@ -55,6 +44,15 @@ func ReadGlobalConfig(fname string) *SCORSHmaster {
log.SetPrefix(cfg.LogPrefix)
}
+ // If the user has not set a spooldir, crash loudly
+ if cfg.Spooldir == "" {
+ log.Fatal("No spooldir defined in ", fname, ". Exiting\n")
+ }
+
+ // Check if the user has set a custom logprefix
+
+ // Check if the user wants to redirect the logs to a file
+
// If we got so far, then there is some sort of config in cfg
log.Printf("Successfully read config from %s\n", fname)
@@ -62,9 +60,6 @@ func ReadGlobalConfig(fname string) *SCORSHmaster {
}
-
-
-
func (cfg *SCORSHmaster) String() string {
var buff bytes.Buffer