From c0a06609919d09fbcb6326ff69cc455dd13506ef Mon Sep 17 00:00:00 2001 From: Kevin Chabowski Date: Sat, 14 Sep 2013 22:37:06 +0200 Subject: Reduced duplicate code for config reading. --- mailing.go | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'mailing.go') diff --git a/mailing.go b/mailing.go index a70138e..efa9a01 100644 --- a/mailing.go +++ b/mailing.go @@ -1,6 +1,7 @@ package main import ( + "kch42.de/gostuff/mailremind/confhelper" "kch42.de/gostuff/mailremind/mailing" "log" ) @@ -22,21 +23,10 @@ func Mail(to, from string, msg []byte) bool { } func initMailing() { - meth, err := conf.GetString("mail", "method") - if err != nil { - log.Fatalf("Could not get mail.method from config: %s", err) - } - - MailFrom, err = conf.GetString("mail", "addr") - if err != nil { - log.Fatalf("Could not get mail.addr from config: %s", err) - } - - parallel, err := conf.GetInt("mail", "parallel") - if err != nil { - log.Fatalf("Could not get mail.parallel from config: %s", err) - } + meth := confhelper.ConfStringOrFatal(conf, "mail", "method") + MailFrom = confhelper.ConfStringOrFatal(conf, "mail", "addr") + parallel := confhelper.ConfIntOrFatal(conf, "mail", "parallel") if parallel <= 0 { log.Fatalln("mail.parallel must be > 0") } -- cgit v1.2.3-54-g00ecf