From 40b81c6cbf5b427fda223aade06c1e933547a91f Mon Sep 17 00:00:00 2001
From: Daniel Langesten <daniel.langest@gmail.com>
Date: Tue, 10 Mar 2015 14:28:37 +0100
Subject: finished configuration parsing

---
 config.go | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/config.go b/config.go
index 2646c23..fb023dd 100644
--- a/config.go
+++ b/config.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
+	"log"
 )
 
 type Config struct {
@@ -17,20 +17,14 @@ type VolumeInfo struct {
 	Upper int    `json:upper`
 }
 
-func main() {
-	readConfig()
-}
-
-func readConfig() {
+func readConfig() (conf Config, err error) {
 	content, err := ioutil.ReadFile("config.json")
 	if err != nil {
-		fmt.Print("Error:", err)
+		log.Println(err)
 	}
-	var conf Config
 	err = json.Unmarshal(content, &conf)
 	if err != nil {
-		fmt.Print("Error:", err)
+		log.Println(err)
 	}
-	fmt.Println(conf)
-
+	return
 }
-- 
cgit v1.1