cacert
/
cacert-boardvoting
8
0
Fork 0
Code Issues Pull Requests Releases 4 Activity

Switch to more flexible go-logging

Browse Source 
This commit switches from loggo to the more flexible go-logging
framework. Logs of severity INFO or higher are now written to a separate
boardvoting.log file.

Errors during execution of mail templates are now logged.

A reasoning for the vote result is now logged and put into the mail
notification when a decision is closed.
debian
Jan Dittberner 7 years ago
parent eec8620e49
commit 4d23b6a48f
6 changed files with 309 additions and 306 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape Escape View File

@ -1,5 +1,6 @@
*.crt *.crt
*.key *.key
*.log
*.pem *.pem
*.sqlite *.sqlite
.*.swp .*.swp

181
boardvoting.go
Unescape Escape View File

@ -11,12 +11,13 @@ import (
"github.com/Masterminds/sprig" "github.com/Masterminds/sprig"
"github.com/gorilla/sessions" "github.com/gorilla/sessions"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/juju/loggo"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
"github.com/op/go-logging"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"html/template" "html/template"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"os"
"strconv" "strconv"
"strings" "strings"
"time" "time"
@ -26,7 +27,7 @@ var config *Config
var store *sessions.CookieStore var store *sessions.CookieStore
var version = "undefined" var version = "undefined"
var build = "undefined" var build = "undefined"
var logger loggo.Logger var log *logging.Logger
const sessionCookieName = "votesession" const sessionCookieName = "votesession"
@ -239,16 +240,16 @@ func getVoteFromRequest(r *http.Request) (vote VoteChoice, ok bool) {
type FlashMessageAction struct{} type FlashMessageAction struct{}
func (a *FlashMessageAction) AddFlash(w http.ResponseWriter, r *http.Request, message interface{}, tags ...string) (err error) { func (a *FlashMessageAction) AddFlash(w http.ResponseWriter, r *http.Request, message interface{}, tags ...string) {
session, err := store.Get(r, sessionCookieName) session, err := store.Get(r, sessionCookieName)
if err != nil { if err != nil {
logger.Errorf("getting session failed: %s", err) log.Errorf("getting session failed: %v", err)
return return
} }
session.AddFlash(message, tags...) session.AddFlash(message, tags...)
session.Save(r, w) session.Save(r, w)
if err != nil { if err != nil {
logger.Errorf("saving session failed: %s", err) log.Errorf("saving session failed: %v", err)
return return
} }
return return
@ -282,17 +283,14 @@ func (a *withDrawMotionAction) Handle(w http.ResponseWriter, r *http.Request) {
decision.Status = voteStatusWithdrawn decision.Status = voteStatusWithdrawn
decision.Modified = time.Now().UTC() decision.Modified = time.Now().UTC()
if err := decision.UpdateStatus(); err != nil { if err := decision.UpdateStatus(); err != nil {
logger.Errorf("withdrawing motion failed: %s", err) log.Errorf("withdrawing motion failed: %v", err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return return
} }
NotifyMailChannel <- NewNotificationWithDrawMotion(&(decision.Decision), voter) NotifyMailChannel <- NewNotificationWithDrawMotion(&(decision.Decision), voter)
if err := a.AddFlash(w, r, fmt.Sprintf("Motion %s has been withdrawn!", decision.Tag)); err != nil { a.AddFlash(w, r, fmt.Sprintf("Motion %s has been withdrawn!", decision.Tag))
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return
}
http.Redirect(w, r, "/motions/", http.StatusTemporaryRedirect) http.Redirect(w, r, "/motions/", http.StatusTemporaryRedirect)
default: default:
@ -335,17 +333,14 @@ func (h *newMotionHandler) Handle(w http.ResponseWriter, r *http.Request) {
data.Proposed = time.Now().UTC() data.Proposed = time.Now().UTC()
data.ProponentId = voter.Id data.ProponentId = voter.Id
if err := data.Create(); err != nil { if err := data.Create(); err != nil {
logger.Errorf("saving motion failed: %s", err) log.Errorf("saving motion failed: %v", err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) http.Error(w, "Saving motion failed", http.StatusInternalServerError)
return return
} }
NotifyMailChannel <- &NotificationCreateMotion{decision: *data, voter: *voter} NotifyMailChannel <- &NotificationCreateMotion{decision: *data, voter: *voter}
if err := h.AddFlash(w, r, "The motion has been proposed!"); err != nil { h.AddFlash(w, r, "The motion has been proposed!")
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return
}
http.Redirect(w, r, "/motions/", http.StatusMovedPermanently) http.Redirect(w, r, "/motions/", http.StatusMovedPermanently)
} }
@ -400,17 +395,14 @@ func (a editMotionAction) Handle(w http.ResponseWriter, r *http.Request) {
} else { } else {
data.Modified = time.Now().UTC() data.Modified = time.Now().UTC()
if err := data.Update(); err != nil { if err := data.Update(); err != nil {
logger.Errorf("updating motion failed: %s", err) log.Errorf("updating motion failed: %v", err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) http.Error(w, "Updating the motion failed.", http.StatusInternalServerError)
return return
} }
NotifyMailChannel <- NewNotificationUpdateMotion(*data, *voter) NotifyMailChannel <- NewNotificationUpdateMotion(*data, *voter)
if err := a.AddFlash(w, r, "The motion has been modified!"); err != nil { a.AddFlash(w, r, "The motion has been modified!")
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return
}
http.Redirect(w, r, "/motions/", http.StatusMovedPermanently) http.Redirect(w, r, "/motions/", http.StatusMovedPermanently)
} }
@ -500,17 +492,14 @@ func (h *directVoteHandler) Handle(w http.ResponseWriter, r *http.Request) {
VoterId: voter.Id, Vote: vote, DecisionId: decision.Id, Voted: time.Now().UTC(), VoterId: voter.Id, Vote: vote, DecisionId: decision.Id, Voted: time.Now().UTC(),
Notes: fmt.Sprintf("Direct Vote\n\n%s", getPEMClientCert(r))} Notes: fmt.Sprintf("Direct Vote\n\n%s", getPEMClientCert(r))}
if err := voteResult.Save(); err != nil { if err := voteResult.Save(); err != nil {
logger.Errorf("Problem saving vote: %s", err) log.Errorf("Problem saving vote: %v", err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) http.Error(w, "Problem saving vote", http.StatusInternalServerError)
return return
} }
NotifyMailChannel <- NewNotificationDirectVote(&decision.Decision, voter, voteResult) NotifyMailChannel <- NewNotificationDirectVote(&decision.Decision, voter, voteResult)
if err := h.AddFlash(w, r, "Your vote has been registered."); err != nil { h.AddFlash(w, r, "Your vote has been registered.")
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return
}
http.Redirect(w, r, "/motions/", http.StatusMovedPermanently) http.Redirect(w, r, "/motions/", http.StatusMovedPermanently)
default: default:
@ -569,7 +558,7 @@ func (h *proxyVoteHandler) Handle(w http.ResponseWriter, r *http.Request) {
if valid, voter, data, justification := form.Validate(); !valid { if valid, voter, data, justification := form.Validate(); !valid {
templateContext.Form = form templateContext.Form = form
templateContext.Decision = decision templateContext.Decision = decision
if voters, err := GetVotersForProxy(proxy, &decision.Decision); err != nil { if voters, err := GetVotersForProxy(proxy); err != nil {
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return return
} else { } else {
@ -584,17 +573,14 @@ func (h *proxyVoteHandler) Handle(w http.ResponseWriter, r *http.Request) {
proxy.Name, justification, getPEMClientCert(r)) proxy.Name, justification, getPEMClientCert(r))
if err := data.Save(); err != nil { if err := data.Save(); err != nil {
logger.Errorf("Error saving vote: %s", err) log.Errorf("Error saving vote: %s", err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return return
} }
NotifyMailChannel <- NewNotificationProxyVote(&decision.Decision, proxy, voter, data, justification) NotifyMailChannel <- NewNotificationProxyVote(&decision.Decision, proxy, voter, data, justification)
if err := h.AddFlash(w, r, "The vote has been registered."); err != nil { h.AddFlash(w, r, "The vote has been registered.")
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return
}
http.Redirect(w, r, "/motions/", http.StatusMovedPermanently) http.Redirect(w, r, "/motions/", http.StatusMovedPermanently)
} }
@ -602,7 +588,7 @@ func (h *proxyVoteHandler) Handle(w http.ResponseWriter, r *http.Request) {
default: default:
templateContext.Form = ProxyVoteForm{} templateContext.Form = ProxyVoteForm{}
templateContext.Decision = decision templateContext.Decision = decision
if voters, err := GetVotersForProxy(proxy, &decision.Decision); err != nil { if voters, err := GetVotersForProxy(proxy); err != nil {
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return return
} else { } else {
@ -665,86 +651,147 @@ type Config struct {
} `yaml:"mail_server"` } `yaml:"mail_server"`
} }
func init() { func setupLogging(ctx context.Context) {
loggo.ConfigureLoggers("<root>=ERROR; boardvoting=INFO") log = logging.MustGetLogger("boardvoting")
logger = loggo.GetLogger("boardvoting") consoleLogFormat := logging.MustStringFormatter(`%{color}%{time:20060102 15:04:05.000-0700} %{longfile} ▶ %{level:s} %{id:05d}%{color:reset} %{message}`)
logger.Infof("Logger initialized") fileLogFormat := logging.MustStringFormatter(`%{time:20060102 15:04:05.000-0700} %{level:s} %{id:05d} %{message}`)
consoleBackend := logging.NewLogBackend(os.Stderr, "", 0)
logfile, err := os.OpenFile("boardvoting.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, os.FileMode(0640))
if err != nil {
panic("Could not open logfile")
}
fileBackend := logging.NewLogBackend(logfile, "", 0)
fileBackendLeveled := logging.AddModuleLevel(logging.NewBackendFormatter(fileBackend, fileLogFormat))
fileBackendLeveled.SetLevel(logging.INFO, "")
logging.SetBackend(fileBackendLeveled,
logging.NewBackendFormatter(consoleBackend, consoleLogFormat))
go func() {
for range ctx.Done() {
if err = logfile.Close(); err != nil {
fmt.Fprintf(os.Stderr, "Problem closing the log file: %v", err)
}
}
}()
log.Info("Setup logging")
}
func readConfig() {
source, err := ioutil.ReadFile("config.yaml") source, err := ioutil.ReadFile("config.yaml")
if err != nil { if err != nil {
logger.Criticalf("Opening configuration file failed: %s", err) log.Panicf("Opening configuration file failed: %v", err)
panic(err)
} }
if err := yaml.Unmarshal(source, &config); err != nil { if err := yaml.Unmarshal(source, &config); err != nil {
logger.Criticalf("Loading configuration failed: %s", err) log.Panicf("Loading configuration failed: %v", err)
panic(err)
} }
cookieSecret, err := base64.StdEncoding.DecodeString(config.CookieSecret) cookieSecret, err := base64.StdEncoding.DecodeString(config.CookieSecret)
if err != nil { if err != nil {
logger.Criticalf("Decoding cookie secret failed: %s", err) log.Panicf("Decoding cookie secret failed: %v", err)
panic(err) panic(err)
} }
if len(cookieSecret) < 32 { if len(cookieSecret) < 32 {
logger.Criticalf("Cookie secret is less than 32 bytes long") log.Panic("Cookie secret is less than 32 bytes long")
panic("Cookie secret too short")
} }
store = sessions.NewCookieStore(cookieSecret) store = sessions.NewCookieStore(cookieSecret)
logger.Infof("Read configuration") log.Info("Read configuration")
}
db, err = sqlx.Open("sqlite3", config.DatabaseFile) func setupDbConfig(ctx context.Context) {
database, err := sqlx.Open("sqlite3", config.DatabaseFile)
if err != nil { if err != nil {
logger.Criticalf("Opening database failed: %s", err) log.Panicf("Opening database failed: %v", err)
panic(err)
} }
logger.Infof("opened database connection") db = NewDB(database)
}
func main() { go func() {
logger.Infof("CAcert Board Voting version %s, build %s", version, build) for range ctx.Done() {
if err := db.Close(); err != nil {
fmt.Fprintf(os.Stderr, "Problem closing the database: %v", err)
}
}
}()
defer db.Close() log.Infof("opened database connection")
}
func setupNotifications(ctx context.Context) {
quitMailChannel := make(chan int) quitMailChannel := make(chan int)
go MailNotifier(quitMailChannel) go MailNotifier(quitMailChannel)
defer func() { quitMailChannel <- 1 }()
go func() {
for range ctx.Done() {
quitMailChannel <- 1
}
}()
}
func setupJobs(ctx context.Context) {
quitChannel := make(chan int) quitChannel := make(chan int)
go JobScheduler(quitChannel) go JobScheduler(quitChannel)
defer func() { quitChannel <- 1 }()
go func() {
for range ctx.Done() {
quitChannel <- 1
}
}()
}
func setupHandlers() {
http.Handle("/motions/", http.StripPrefix("/motions/", motionsHandler{})) http.Handle("/motions/", http.StripPrefix("/motions/", motionsHandler{}))
http.Handle("/newmotion/", motionsHandler{}) http.Handle("/newmotion/", motionsHandler{})
http.Handle("/proxy/", &decisionVoteHandler{}) http.Handle("/proxy/", &decisionVoteHandler{})
http.Handle("/vote/", &decisionVoteHandler{}) http.Handle("/vote/", &decisionVoteHandler{})
http.Handle("/static/", http.FileServer(http.Dir("."))) http.Handle("/static/", http.FileServer(http.Dir(".")))
http.Handle("/", http.RedirectHandler("/motions/", http.StatusMovedPermanently)) http.Handle("/", http.RedirectHandler("/motions/", http.StatusMovedPermanently))
}
func setupTLSConfig() (tlsConfig *tls.Config) {
// load CA certificates for client authentication // load CA certificates for client authentication
caCert, err := ioutil.ReadFile(config.ClientCACertificates) caCert, err := ioutil.ReadFile(config.ClientCACertificates)
if err != nil { if err != nil {
logger.Criticalf("Error reading client certificate CAs", err) log.Panicf("Error reading client certificate CAs %v", err)
panic(err)
} }
caCertPool := x509.NewCertPool() caCertPool := x509.NewCertPool()
if !caCertPool.AppendCertsFromPEM(caCert) { if !caCertPool.AppendCertsFromPEM(caCert) {
logger.Criticalf("could not initialize client CA certificate pool") log.Panic("could not initialize client CA certificate pool")
panic("client certificate CA pool initialization failed")
} }
// setup HTTPS server // setup HTTPS server
tlsConfig := &tls.Config{ tlsConfig = &tls.Config{
ClientCAs: caCertPool, ClientCAs: caCertPool,
ClientAuth: tls.VerifyClientCertIfGiven, ClientAuth: tls.VerifyClientCertIfGiven,
} }
tlsConfig.BuildNameToCertificate() tlsConfig.BuildNameToCertificate()
return
}
func main() {
var stopAll func()
executionContext, stopAll := context.WithCancel(context.Background())
setupLogging(executionContext)
readConfig()
setupDbConfig(executionContext)
setupNotifications(executionContext)
setupJobs(executionContext)
setupHandlers()
tlsConfig := setupTLSConfig()
defer stopAll()
log.Infof("CAcert Board Voting version %s, build %s", version, build)
server := &http.Server{ server := &http.Server{
Addr: ":8443", Addr: ":8443",
TLSConfig: tlsConfig, TLSConfig: tlsConfig,
} }
logger.Infof("Launching application on https://localhost%s/", server.Addr) log.Infof("Launching application on https://localhost%s/", server.Addr)
errs := make(chan error, 1) errs := make(chan error, 1)
go func() { go func() {
@ -754,12 +801,10 @@ func main() {
close(errs) close(errs)
}() }()
if err = server.ListenAndServeTLS(config.ServerCert, config.ServerKey); err != nil { if err := server.ListenAndServeTLS(config.ServerCert, config.ServerKey); err != nil {
logger.Criticalf("ListenAndServerTLS failed: %s", err) log.Panicf("ListenAndServerTLS failed: %v", err)
panic(err)
} }
if err := <-errs; err != nil { if err := <-errs; err != nil {
logger.Criticalf("ListenAndServe failed: %s", err) log.Panicf("ListenAndServe failed: %v", err)
panic(err)
} }
} }

26
jobs.go
Unescape Escape View File

@ -22,19 +22,19 @@ func JobScheduler(quitChannel chan int) {
JobIdCloseDecisions: NewCloseDecisionsJob(), JobIdCloseDecisions: NewCloseDecisionsJob(),
JobIdRemindVotersJob: NewRemindVotersJob(), JobIdRemindVotersJob: NewRemindVotersJob(),
} }
logger.Infof("started job scheduler") log.Info("started job scheduler")
for { for {
select { select {
case jobId := <-rescheduleChannel: case jobId := <-rescheduleChannel:
job := jobs[jobId] job := jobs[jobId]
logger.Infof("reschedule job %s", job) log.Infof("reschedule job %s", job)
job.Schedule() job.Schedule()
case <-quitChannel: case <-quitChannel:
for _, job := range jobs { for _, job := range jobs {
job.Stop() job.Stop()
} }
logger.Infof("stop job scheduler") log.Info("stop job scheduler")
return return
} }
} }
@ -54,7 +54,7 @@ func (j *CloseDecisionsJob) Schedule() {
var nextDue *time.Time var nextDue *time.Time
nextDue, err := GetNextPendingDecisionDue() nextDue, err := GetNextPendingDecisionDue()
if err != nil { if err != nil {
logger.Errorf("Could not get next pending due date") log.Error("Could not get next pending due date")
if j.timer != nil { if j.timer != nil {
j.timer.Stop() j.timer.Stop()
j.timer = nil j.timer = nil
@ -62,11 +62,11 @@ func (j *CloseDecisionsJob) Schedule() {
return return
} }
if nextDue == nil { if nextDue == nil {
logger.Infof("no next planned execution of CloseDecisionsJob") log.Info("no next planned execution of CloseDecisionsJob")
j.Stop() j.Stop()
} else { } else {
nextDue := nextDue.Add(time.Minute) nextDue := nextDue.Add(time.Second)
logger.Infof("scheduling CloseDecisionsJob for %s", nextDue) log.Infof("scheduling CloseDecisionsJob for %s", nextDue)
when := nextDue.Sub(time.Now()) when := nextDue.Sub(time.Now())
if j.timer != nil { if j.timer != nil {
j.timer.Reset(when) j.timer.Reset(when)
@ -84,10 +84,10 @@ func (j *CloseDecisionsJob) Stop() {
} }
func (j *CloseDecisionsJob) Run() { func (j *CloseDecisionsJob) Run() {
logger.Infof("running CloseDecisionsJob") log.Debug("running CloseDecisionsJob")
err := CloseDecisions() err := CloseDecisions()
if err != nil { if err != nil {
logger.Errorf("closing decisions %s", err) log.Errorf("closing decisions %v", err)
} }
rescheduleChannel <- JobIdCloseDecisions rescheduleChannel <- JobIdCloseDecisions
} }
@ -109,7 +109,7 @@ func NewRemindVotersJob() *RemindVotersJob {
func (j *RemindVotersJob) Schedule() { func (j *RemindVotersJob) Schedule() {
year, month, day := time.Now().UTC().Date() year, month, day := time.Now().UTC().Date()
nextExecution := time.Date(year, month, day, 0, 0, 0, 0, time.UTC).AddDate(0, 0, 3) nextExecution := time.Date(year, month, day, 0, 0, 0, 0, time.UTC).AddDate(0, 0, 3)
logger.Infof("scheduling RemindVotersJob for %s", nextExecution) log.Infof("scheduling RemindVotersJob for %s", nextExecution)
when := nextExecution.Sub(time.Now()) when := nextExecution.Sub(time.Now())
if j.timer != nil { if j.timer != nil {
j.timer.Reset(when) j.timer.Reset(when)
@ -126,19 +126,19 @@ func (j *RemindVotersJob) Stop() {
} }
func (j *RemindVotersJob) Run() { func (j *RemindVotersJob) Run() {
logger.Infof("running RemindVotersJob") log.Info("running RemindVotersJob")
defer func() { rescheduleChannel <- JobIdRemindVotersJob }() defer func() { rescheduleChannel <- JobIdRemindVotersJob }()
voters, err := GetReminderVoters() voters, err := GetReminderVoters()
if err != nil { if err != nil {
logger.Errorf("problem getting voters %s", err) log.Errorf("problem getting voters %v", err)
return return
} }
for _, voter := range *voters { for _, voter := range *voters {
decisions, err := FindUnvotedDecisionsForVoter(&voter) decisions, err := FindUnvotedDecisionsForVoter(&voter)
if err != nil { if err != nil {
logger.Errorf("problem getting unvoted decisions") log.Errorf("problem getting unvoted decisions: %v", err)
return return
} }
if len(*decisions) > 0 { if len(*decisions) > 0 {

378
models.go
Unescape Escape View File

@ -106,7 +106,7 @@ WHERE decisions.status=0 AND :now > due`,
SELECT due FROM decisions WHERE status=0 ORDER BY due LIMIT 1`, SELECT due FROM decisions WHERE status=0 ORDER BY due LIMIT 1`,
sqlGetVotersForProxy: ` sqlGetVotersForProxy: `
SELECT id, name, reminder SELECT id, name, reminder
FROM voters WHERE enabled=1 AND id != $1 AND id NOT IN (SELECT voter FROM votes WHERE decision=$2)`, FROM voters WHERE enabled=1 AND id != $1`,
sqlGetReminderVoters: ` sqlGetReminderVoters: `
SELECT id, name, reminder FROM voters WHERE enabled=1 AND reminder!='' AND reminder IS NOT NULL`, SELECT id, name, reminder FROM voters WHERE enabled=1 AND reminder!='' AND reminder IS NOT NULL`,
sqlFindUnvotedDecisionsForVoter: ` sqlFindUnvotedDecisionsForVoter: `
@ -123,47 +123,6 @@ FROM votes
WHERE decision=$1 AND voter=$2`, WHERE decision=$1 AND voter=$2`,
} }
var db *sqlx.DB
func init() {
failed_statements := make([]string, 0)
for _, sqlStatement := range sqlStatements {
var stmt *sqlx.Stmt
stmt, err := db.Preparex(sqlStatement)
if err != nil {
logger.Criticalf("ERROR parsing statement %s: %s", sqlStatement, err)
failed_statements = append(failed_statements, sqlStatement)
}
stmt.Close()
}
if len(failed_statements) > 0 {
panic(fmt.Sprintf("%d statements failed", len(failed_statements)))
}
migrateConf := &goose.DBConf{
MigrationsDir: config.MigrationsPath,
Env: "production",
Driver: goose.DBDriver{
Name: "sqlite3",
OpenStr: config.DatabaseFile,
Import: "github.com/mattn/go-sqlite3",
Dialect: &goose.Sqlite3Dialect{},
},
}
latest, err := goose.GetMostRecentDBVersion(migrateConf.MigrationsDir)
if err != nil {
logger.Criticalf("getting the most recent database repository version failed: %s", err)
panic(err)
}
err = goose.RunMigrationsOnDb(migrateConf, migrateConf.MigrationsDir, latest, db.DB)
if err != nil {
logger.Criticalf("running database migration failed: %s", err)
panic(err)
}
}
type VoteType uint8 type VoteType uint8
type VoteStatus int8 type VoteStatus int8
@ -282,30 +241,86 @@ type Vote struct {
Notes string Notes string
} }
func (v *Vote) Save() (err error) { type dbHandler struct {
insertVoteStmt, err := db.PrepareNamed(sqlStatements[sqlCreateVote]) db *sqlx.DB
}
var db *dbHandler
func NewDB(database *sqlx.DB) *dbHandler {
handler := &dbHandler{db: database}
failed_statements := make([]string, 0)
for _, sqlStatement := range sqlStatements {
var stmt *sqlx.Stmt
stmt, err := database.Preparex(sqlStatement)
if err != nil {
log.Criticalf("ERROR parsing statement %s: %s", sqlStatement, err)
failed_statements = append(failed_statements, sqlStatement)
}
stmt.Close()
}
if len(failed_statements) > 0 {
log.Panicf("%d statements failed to prepare", len(failed_statements))
}
migrateConf := &goose.DBConf{
MigrationsDir: config.MigrationsPath,
Env: "production",
Driver: goose.DBDriver{
Name: "sqlite3",
OpenStr: config.DatabaseFile,
Import: "github.com/mattn/go-sqlite3",
Dialect: &goose.Sqlite3Dialect{},
},
}
latest, err := goose.GetMostRecentDBVersion(migrateConf.MigrationsDir)
if err != nil { if err != nil {
logger.Errorf("preparing statement failed: %s", err) log.Panicf("getting the most recent database repository version failed: %v", err)
return
} }
defer insertVoteStmt.Close()
_, err = insertVoteStmt.Exec(v) err = goose.RunMigrationsOnDb(migrateConf, migrateConf.MigrationsDir, latest, database.DB)
if err != nil { if err != nil {
logger.Errorf("saving vote failed: %s", err) log.Panicf("running database migration failed: %v", err)
return
} }
return handler
}
func (d *dbHandler) Close() error {
return d.db.Close()
}
func (d *dbHandler) getPreparedNamedStatement(statementKey sqlKey) *sqlx.NamedStmt {
statement, err := d.db.PrepareNamed(sqlStatements[statementKey])
if err != nil {
log.Panicf("Preparing statement failed: %v", err)
}
return statement
}
getVoteStmt, err := db.Preparex(sqlStatements[sqlLoadVote]) func (d *dbHandler) getPreparedStatement(statementKey sqlKey) *sqlx.Stmt {
statement, err := d.db.Preparex(sqlStatements[statementKey])
if err != nil { if err != nil {
logger.Errorf("preparing statement failed: %s", err) log.Panicf("Preparing statement failed: %v", err)
}
return statement
}
func (v *Vote) Save() (err error) {
insertVoteStmt := db.getPreparedNamedStatement(sqlCreateVote)
defer insertVoteStmt.Close()
if _, err = insertVoteStmt.Exec(v); err != nil {
log.Errorf("saving vote failed: %v", err)
return return
} }
getVoteStmt := db.getPreparedStatement(sqlLoadVote)
defer getVoteStmt.Close() defer getVoteStmt.Close()
err = getVoteStmt.Get(v, v.DecisionId, v.VoterId) if err = getVoteStmt.Get(v, v.DecisionId, v.VoterId); err != nil {
if err != nil { log.Errorf("getting inserted vote failed: %v", err)
logger.Errorf("getting inserted vote failed: %s", err) return
} }
return return
@ -333,6 +348,17 @@ func (v *VoteSums) Percent() int {
return v.Ayes * 100 / totalVotes return v.Ayes * 100 / totalVotes
} }
func (v *VoteSums) CalculateResult(quorum int, majority int) (status VoteStatus, reasoning string) {
if v.VoteCount() < quorum {
status, reasoning = voteStatusDeclined, fmt.Sprintf("Needed quorum of %d has not been reached.", quorum)
} else if (v.Ayes / v.TotalVotes()) < (majority / 100) {
status, reasoning = voteStatusDeclined, fmt.Sprintf("Needed majority of %d%% has not been reached.", majority)
} else {
status, reasoning = voteStatusApproved, "Quorum and majority have been reached"
}
return
}
type VoteForDisplay struct { type VoteForDisplay struct {
Vote Vote
Name string Name string
@ -346,11 +372,7 @@ type DecisionForDisplay struct {
} }
func FindDecisionForDisplayByTag(tag string) (decision *DecisionForDisplay, err error) { func FindDecisionForDisplayByTag(tag string) (decision *DecisionForDisplay, err error) {
decisionStmt, err := db.Preparex(sqlStatements[sqlLoadDecisionByTag]) decisionStmt := db.getPreparedStatement(sqlLoadDecisionByTag)
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
}
defer decisionStmt.Close() defer decisionStmt.Close()
decision = &DecisionForDisplay{} decision = &DecisionForDisplay{}
@ -359,7 +381,8 @@ func FindDecisionForDisplayByTag(tag string) (decision *DecisionForDisplay, err
decision = nil decision = nil
err = nil err = nil
} else { } else {
logger.Errorf("getting motion %s failed: %v", tag, err) log.Errorf("getting motion %s failed: %v", tag, err)
return
} }
} }
decision.VoteSums, err = decision.Decision.VoteSums() decision.VoteSums, err = decision.Decision.VoteSums()
@ -374,13 +397,9 @@ func FindDecisionForDisplayByTag(tag string) (decision *DecisionForDisplay, err
func FindDecisionsForDisplayOnPage(page int64, unvoted bool, voter *Voter) (decisions []*DecisionForDisplay, err error) { func FindDecisionsForDisplayOnPage(page int64, unvoted bool, voter *Voter) (decisions []*DecisionForDisplay, err error) {
var decisionsStmt *sqlx.Stmt var decisionsStmt *sqlx.Stmt
if unvoted && voter != nil { if unvoted && voter != nil {
decisionsStmt, err = db.Preparex(sqlStatements[sqlLoadUnvotedDecisions]) decisionsStmt = db.getPreparedStatement(sqlLoadUnvotedDecisions)
} else { } else {
decisionsStmt, err = db.Preparex(sqlStatements[sqlLoadDecisions]) decisionsStmt = db.getPreparedStatement(sqlLoadDecisions)
}
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
} }
defer decisionsStmt.Close() defer decisionsStmt.Close()
@ -391,7 +410,7 @@ func FindDecisionsForDisplayOnPage(page int64, unvoted bool, voter *Voter) (deci
rows, err = decisionsStmt.Queryx(page - 1) rows, err = decisionsStmt.Queryx(page - 1)
} }
if err != nil { if err != nil {
logger.Errorf("loading motions for page %d failed: %v", page, err) log.Errorf("loading motions for page %d failed: %v", page, err)
return return
} }
defer rows.Close() defer rows.Close()
@ -399,7 +418,7 @@ func FindDecisionsForDisplayOnPage(page int64, unvoted bool, voter *Voter) (deci
for rows.Next() { for rows.Next() {
var d DecisionForDisplay var d DecisionForDisplay
if err = rows.StructScan(&d); err != nil { if err = rows.StructScan(&d); err != nil {
logger.Errorf("loading motions for page %d failed: %v", page, err) log.Errorf("loading motions for page %d failed: %v", page, err)
return return
} }
d.VoteSums, err = d.Decision.VoteSums() d.VoteSums, err = d.Decision.VoteSums()
@ -412,16 +431,12 @@ func FindDecisionsForDisplayOnPage(page int64, unvoted bool, voter *Voter) (deci
} }
func (d *Decision) VoteSums() (sums *VoteSums, err error) { func (d *Decision) VoteSums() (sums *VoteSums, err error) {
votesStmt, err := db.Preparex(sqlStatements[sqlLoadVoteCountsForDecision]) votesStmt := db.getPreparedStatement(sqlLoadVoteCountsForDecision)
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
}
defer votesStmt.Close() defer votesStmt.Close()
voteRows, err := votesStmt.Queryx(d.Id) voteRows, err := votesStmt.Queryx(d.Id)
if err != nil { if err != nil {
logger.Errorf("fetching vote sums for motion %s failed: %v", d.Tag, err) log.Errorf("fetching vote sums for motion %s failed: %v", d.Tag, err)
return return
} }
defer voteRows.Close() defer voteRows.Close()
@ -431,7 +446,7 @@ func (d *Decision) VoteSums() (sums *VoteSums, err error) {
var vote VoteChoice var vote VoteChoice
var count int var count int
if err = voteRows.Scan(&vote, &count); err != nil { if err = voteRows.Scan(&vote, &count); err != nil {
logger.Errorf("fetching vote sums for motion %s failed: %v", d.Tag, err) log.Errorf("fetching vote sums for motion %s failed: %v", d.Tag, err)
return return
} }
switch vote { switch vote {
@ -447,39 +462,33 @@ func (d *Decision) VoteSums() (sums *VoteSums, err error) {
} }
func (d *DecisionForDisplay) LoadVotes() (err error) { func (d *DecisionForDisplay) LoadVotes() (err error) {
votesStmt, err := db.Preparex(sqlStatements[sqlLoadVotesForDecision]) votesStmt := db.getPreparedStatement(sqlLoadVotesForDecision)
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
}
defer votesStmt.Close() defer votesStmt.Close()
err = votesStmt.Select(&d.Votes, d.Id) err = votesStmt.Select(&d.Votes, d.Id)
if err != nil { if err != nil {
logger.Errorf("selecting votes for motion %s failed: %v", d.Tag, err) log.Errorf("selecting votes for motion %s failed: %v", d.Tag, err)
return
} }
return return
} }
func (d *Decision) OlderExists(unvoted bool, voter *Voter) (result bool, err error) { func (d *Decision) OlderExists(unvoted bool, voter *Voter) (result bool, err error) {
var olderStmt *sqlx.Stmt
if unvoted && voter != nil { if unvoted && voter != nil {
olderStmt, err = db.Preparex(sqlStatements[sqlCountOlderThanUnvotedDecision]) olderStmt := db.getPreparedStatement(sqlCountOlderThanUnvotedDecision)
} else { defer olderStmt.Close()
olderStmt, err = db.Preparex(sqlStatements[sqlCountOlderThanDecision])
}
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
}
defer olderStmt.Close()
if unvoted && voter != nil {
if err = olderStmt.Get(&result, d.Proposed, voter.Id); err != nil { if err = olderStmt.Get(&result, d.Proposed, voter.Id); err != nil {
logger.Errorf("finding older motions than %s failed: %v", d.Tag, err) log.Errorf("finding older motions than %s failed: %v", d.Tag, err)
return
} }
} else { } else {
olderStmt := db.getPreparedStatement(sqlCountOlderThanDecision)
defer olderStmt.Close()
if err = olderStmt.Get(&result, d.Proposed); err != nil { if err = olderStmt.Get(&result, d.Proposed); err != nil {
logger.Errorf("finding older motions than %s failed: %v", d.Tag, err) log.Errorf("finding older motions than %s failed: %v", d.Tag, err)
return
} }
} }
@ -487,76 +496,62 @@ func (d *Decision) OlderExists(unvoted bool, voter *Voter) (result bool, err err
} }
func (d *Decision) Create() (err error) { func (d *Decision) Create() (err error) {
insertDecisionStmt, err := db.PrepareNamed(sqlStatements[sqlCreateDecision]) insertDecisionStmt := db.getPreparedNamedStatement(sqlCreateDecision)
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
}
defer insertDecisionStmt.Close() defer insertDecisionStmt.Close()
result, err := insertDecisionStmt.Exec(d) result, err := insertDecisionStmt.Exec(d)
if err != nil { if err != nil {
logger.Errorf("creating motion failed: %s", err) log.Errorf("creating motion failed: %v", err)
return return
} }
lastInsertId, err := result.LastInsertId() lastInsertId, err := result.LastInsertId()
if err != nil { if err != nil {
logger.Errorf("getting id of inserted motion failed: %s", err) log.Errorf("getting id of inserted motion failed: %v", err)
return return
} }
rescheduleChannel <- JobIdCloseDecisions rescheduleChannel <- JobIdCloseDecisions
getDecisionStmt, err := db.Preparex(sqlStatements[sqlLoadDecisionById]) getDecisionStmt := db.getPreparedStatement(sqlLoadDecisionById)
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
}
defer getDecisionStmt.Close() defer getDecisionStmt.Close()
err = getDecisionStmt.Get(d, lastInsertId) err = getDecisionStmt.Get(d, lastInsertId)
if err != nil { if err != nil {
logger.Errorf("getting inserted motion failed: %s", err) log.Errorf("getting inserted motion failed: %v", err)
return
} }
return return
} }
func (d *Decision) LoadWithId() (err error) { func (d *Decision) LoadWithId() (err error) {
getDecisionStmt, err := db.Preparex(sqlStatements[sqlLoadDecisionById]) getDecisionStmt := db.getPreparedStatement(sqlLoadDecisionById)
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
}
defer getDecisionStmt.Close() defer getDecisionStmt.Close()
err = getDecisionStmt.Get(d, d.Id) err = getDecisionStmt.Get(d, d.Id)
if err != nil { if err != nil {
logger.Errorf("loading updated motion failed: %s", err) log.Errorf("loading updated motion failed: %v", err)
return
} }
return return
} }
func (d *Decision) Update() (err error) { func (d *Decision) Update() (err error) {
updateDecisionStmt, err := db.PrepareNamed(sqlStatements[sqlUpdateDecision]) updateDecisionStmt := db.getPreparedNamedStatement(sqlUpdateDecision)
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
}
defer updateDecisionStmt.Close() defer updateDecisionStmt.Close()
result, err := updateDecisionStmt.Exec(d) result, err := updateDecisionStmt.Exec(d)
if err != nil { if err != nil {
logger.Errorf("updating motion failed: %s", err) log.Errorf("updating motion failed: %v", err)
return return
} }
affectedRows, err := result.RowsAffected() affectedRows, err := result.RowsAffected()
if err != nil { if err != nil {
logger.Errorf("Problem determining the affected rows") log.Error("Problem determining the affected rows")
return return
} else if affectedRows != 1 { } else if affectedRows != 1 {
logger.Warningf("wrong number of affected rows: %d (1 expected)", affectedRows) log.Warningf("wrong number of affected rows: %d (1 expected)", affectedRows)
} }
rescheduleChannel <- JobIdCloseDecisions rescheduleChannel <- JobIdCloseDecisions
@ -565,24 +560,20 @@ func (d *Decision) Update() (err error) {
} }
func (d *Decision) UpdateStatus() (err error) { func (d *Decision) UpdateStatus() (err error) {
updateStatusStmt, err := db.PrepareNamed(sqlStatements[sqlUpdateDecisionStatus]) updateStatusStmt := db.getPreparedNamedStatement(sqlUpdateDecisionStatus)
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
}
defer updateStatusStmt.Close() defer updateStatusStmt.Close()
result, err := updateStatusStmt.Exec(d) result, err := updateStatusStmt.Exec(d)
if err != nil { if err != nil {
logger.Errorf("setting motion status failed: %s", err) log.Errorf("setting motion status failed: %v", err)
return return
} }
affectedRows, err := result.RowsAffected() affectedRows, err := result.RowsAffected()
if err != nil { if err != nil {
logger.Errorf("determining the affected rows failed: %s", err) log.Errorf("determining the affected rows failed: %v", err)
return return
} else if affectedRows != 1 { } else if affectedRows != 1 {
logger.Warningf("wrong number of affected rows: %d (1 expected)", affectedRows) log.Warningf("wrong number of affected rows: %d (1 expected)", affectedRows)
} }
rescheduleChannel <- JobIdCloseDecisions rescheduleChannel <- JobIdCloseDecisions
@ -595,17 +586,13 @@ func (d *Decision) String() string {
} }
func FindVoterByAddress(emailAddress string) (voter *Voter, err error) { func FindVoterByAddress(emailAddress string) (voter *Voter, err error) {
findVoterStmt, err := db.Preparex(sqlStatements[sqlLoadEnabledVoterByEmail]) findVoterStmt := db.getPreparedStatement(sqlLoadEnabledVoterByEmail)
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
}
defer findVoterStmt.Close() defer findVoterStmt.Close()
voter = &Voter{} voter = &Voter{}
if err = findVoterStmt.Get(voter, emailAddress); err != nil { if err = findVoterStmt.Get(voter, emailAddress); err != nil {
if err != sql.ErrNoRows { if err != sql.ErrNoRows {
logger.Errorf("getting voter for address %s failed: %v", emailAddress, err) log.Errorf("getting voter for address %s failed: %v", emailAddress, err)
} else { } else {
err = nil err = nil
voter = nil voter = nil
@ -614,72 +601,56 @@ func FindVoterByAddress(emailAddress string) (voter *Voter, err error) {
return return
} }
func (d *Decision) Close() (err error) { func (d *Decision) Close() error {
quorum, majority := d.VoteType.QuorumAndMajority() quorum, majority := d.VoteType.QuorumAndMajority()
voteSums, err := d.VoteSums() var voteSums *VoteSums
var err error
if err != nil {
logger.Errorf("getting vote sums failed: %s", err)
return
}
votes := voteSums.VoteCount()
if votes < quorum { if voteSums, err = d.VoteSums(); err != nil {
d.Status = voteStatusDeclined log.Errorf("getting vote sums failed: %v", err)
} else { return err
votes = voteSums.TotalVotes()
if (voteSums.Ayes / votes) > (majority / 100) {
d.Status = voteStatusApproved
} else {
d.Status = voteStatusDeclined
}
} }
var reasoning string
d.Status, reasoning = voteSums.CalculateResult(quorum, majority)
closeDecisionStmt, err := db.PrepareNamed(sqlStatements[sqlUpdateDecisionStatus]) closeDecisionStmt := db.getPreparedNamedStatement(sqlUpdateDecisionStatus)
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
}
defer closeDecisionStmt.Close() defer closeDecisionStmt.Close()
result, err := closeDecisionStmt.Exec(d) result, err := closeDecisionStmt.Exec(d)
if err != nil { if err != nil {
logger.Errorf("closing vote failed: %s", err) log.Errorf("closing vote failed: %v", err)
return return err
}
affectedRows, err := result.RowsAffected()
if err != nil {
logger.Errorf("getting affected rows failed: %s", err)
} }
if affectedRows != 1 { if affectedRows, err := result.RowsAffected(); err != nil {
logger.Warningf("wrong number of affected rows: %d (1 expected)", affectedRows) log.Errorf("getting affected rows failed: %v", err)
return err
} else if affectedRows != 1 {
log.Warningf("wrong number of affected rows: %d (1 expected)", affectedRows)
} }
NotifyMailChannel <- NewNotificationClosedDecision(d, voteSums) NotifyMailChannel <- NewNotificationClosedDecision(d, voteSums, reasoning)
return log.Infof("decision %s closed with result %s: reasoning %s", d.Tag, d.Status, reasoning)
return nil
} }
func CloseDecisions() (err error) { func CloseDecisions() (err error) {
getClosableDecisionsStmt, err := db.PrepareNamed(sqlStatements[sqlSelectClosableDecisions]) getClosableDecisionsStmt := db.getPreparedNamedStatement(sqlSelectClosableDecisions)
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
}
defer getClosableDecisionsStmt.Close() defer getClosableDecisionsStmt.Close()
decisions := make([]*Decision, 0) decisions := make([]*Decision, 0)
rows, err := getClosableDecisionsStmt.Queryx(struct{ Now time.Time }{time.Now().UTC()}) rows, err := getClosableDecisionsStmt.Queryx(struct{ Now time.Time }{time.Now().UTC()})
if err != nil { if err != nil {
logger.Errorf("fetching closable decisions failed: %s", err) log.Errorf("fetching closable decisions failed: %v", err)
return return
} }
defer rows.Close() defer rows.Close()
for rows.Next() { for rows.Next() {
decision := &Decision{} decision := &Decision{}
if err = rows.StructScan(decision); err != nil { if err = rows.StructScan(decision); err != nil {
logger.Errorf("scanning row failed: %s", err) log.Errorf("scanning row failed: %v", err)
return return
} }
decisions = append(decisions, decision) decisions = append(decisions, decision)
@ -687,9 +658,9 @@ func CloseDecisions() (err error) {
rows.Close() rows.Close()
for _, decision := range decisions { for _, decision := range decisions {
logger.Debugf("found closable decision %s", decision.Tag) log.Debugf("found closable decision %s", decision.Tag)
if err = decision.Close(); err != nil { if err = decision.Close(); err != nil {
logger.Errorf("closing decision %s failed: %s", decision.Tag, err) log.Errorf("closing decision %s failed: %s", decision.Tag, err)
return return
} }
} }
@ -698,41 +669,32 @@ func CloseDecisions() (err error) {
} }
func GetNextPendingDecisionDue() (due *time.Time, err error) { func GetNextPendingDecisionDue() (due *time.Time, err error) {
getNextPendingDecisionDueStmt, err := db.Preparex(sqlStatements[sqlGetNextPendingDecisionDue]) getNextPendingDecisionDueStmt := db.getPreparedStatement(sqlGetNextPendingDecisionDue)
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
}
defer getNextPendingDecisionDueStmt.Close() defer getNextPendingDecisionDueStmt.Close()
row := getNextPendingDecisionDueStmt.QueryRow() row := getNextPendingDecisionDueStmt.QueryRow()
var dueTimestamp time.Time due = &time.Time{}
if err = row.Scan(&dueTimestamp); err != nil { if err = row.Scan(due); err != nil {
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
logger.Debugf("No pending decisions") log.Debug("No pending decisions")
return nil, nil return nil, nil
} }
logger.Errorf("parsing result failed: %s", err) log.Errorf("parsing result failed: %v", err)
return return nil, err
} }
due = &dueTimestamp
return return
} }
func GetReminderVoters() (voters *[]Voter, err error) { func GetReminderVoters() (voters *[]Voter, err error) {
getReminderVotersStmt, err := db.Preparex(sqlStatements[sqlGetReminderVoters]) getReminderVotersStmt := db.getPreparedStatement(sqlGetReminderVoters)
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
}
defer getReminderVotersStmt.Close() defer getReminderVotersStmt.Close()
voterSlice := make([]Voter, 0) voterSlice := make([]Voter, 0)
if err = getReminderVotersStmt.Select(&voterSlice); err != nil { if err = getReminderVotersStmt.Select(&voterSlice); err != nil {
logger.Errorf("getting voters failed: %s", err) log.Errorf("getting voters failed: %v", err)
return return
} }
voters = &voterSlice voters = &voterSlice
@ -741,17 +703,13 @@ func GetReminderVoters() (voters *[]Voter, err error) {
} }
func FindUnvotedDecisionsForVoter(voter *Voter) (decisions *[]Decision, err error) { func FindUnvotedDecisionsForVoter(voter *Voter) (decisions *[]Decision, err error) {
findUnvotedDecisionsForVoterStmt, err := db.Preparex(sqlStatements[sqlFindUnvotedDecisionsForVoter]) findUnvotedDecisionsForVoterStmt := db.getPreparedStatement(sqlFindUnvotedDecisionsForVoter)
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
}
defer findUnvotedDecisionsForVoterStmt.Close() defer findUnvotedDecisionsForVoterStmt.Close()
decisionsSlice := make([]Decision, 0) decisionsSlice := make([]Decision, 0)
if err = findUnvotedDecisionsForVoterStmt.Select(&decisionsSlice, voter.Id); err != nil { if err = findUnvotedDecisionsForVoterStmt.Select(&decisionsSlice, voter.Id); err != nil {
logger.Errorf("getting unvoted decisions failed: %s", err) log.Errorf("getting unvoted decisions failed: %v", err)
return return
} }
decisions = &decisionsSlice decisions = &decisionsSlice
@ -760,34 +718,26 @@ func FindUnvotedDecisionsForVoter(voter *Voter) (decisions *[]Decision, err erro
} }
func GetVoterById(id int64) (voter *Voter, err error) { func GetVoterById(id int64) (voter *Voter, err error) {
getVoterByIdStmt, err := db.Preparex(sqlStatements[sqlGetEnabledVoterById]) getVoterByIdStmt := db.getPreparedStatement(sqlGetEnabledVoterById)
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
}
defer getVoterByIdStmt.Close() defer getVoterByIdStmt.Close()
voter = &Voter{} voter = &Voter{}
if err = getVoterByIdStmt.Get(voter, id); err != nil { if err = getVoterByIdStmt.Get(voter, id); err != nil {
logger.Errorf("getting voter failed: %s", err) log.Errorf("getting voter failed: %v", err)
return return
} }
return return
} }
func GetVotersForProxy(proxy *Voter, decision *Decision) (voters *[]Voter, err error) { func GetVotersForProxy(proxy *Voter) (voters *[]Voter, err error) {
getVotersForProxyStmt, err := db.Preparex(sqlStatements[sqlGetVotersForProxy]) getVotersForProxyStmt := db.getPreparedStatement(sqlGetVotersForProxy)
if err != nil {
logger.Errorf("preparing statement failed: %s", err)
return
}
defer getVotersForProxyStmt.Close() defer getVotersForProxyStmt.Close()
votersSlice := make([]Voter, 0) votersSlice := make([]Voter, 0)
if err = getVotersForProxyStmt.Select(&votersSlice, proxy.Id, decision.Id); err != nil { if err = getVotersForProxyStmt.Select(&votersSlice, proxy.Id); err != nil {
logger.Errorf("Error getting voters for proxy failed: %s", err) log.Errorf("Error getting voters for proxy failed: %v", err)
return return
} }
voters = &votersSlice voters = &votersSlice

23
notifications.go
Unescape Escape View File

@ -34,14 +34,14 @@ type NotificationMail interface {
var NotifyMailChannel = make(chan NotificationMail, 1) var NotifyMailChannel = make(chan NotificationMail, 1)
func MailNotifier(quitMailNotifier chan int) { func MailNotifier(quitMailNotifier chan int) {
logger.Infof("Launched mail notifier") log.Info("Launched mail notifier")
for { for {
select { select {
case notification := <-NotifyMailChannel: case notification := <-NotifyMailChannel:
content := notification.GetNotificationContent() content := notification.GetNotificationContent()
mailText, err := buildMail(content.template, content.data) mailText, err := buildMail(content.template, content.data)
if err != nil { if err != nil {
logger.Errorf("building mail failed: %s", err) log.Errorf("building mail failed: %v", err)
continue continue
} }
@ -58,10 +58,10 @@ func MailNotifier(quitMailNotifier chan int) {
d := gomail.NewDialer(config.MailServer.Host, config.MailServer.Port, "", "") d := gomail.NewDialer(config.MailServer.Host, config.MailServer.Port, "", "")
if err := d.DialAndSend(m); err != nil { if err := d.DialAndSend(m); err != nil {
logger.Errorf("sending mail failed: %s", err) log.Errorf("sending mail failed: %v", err)
} }
case <-quitMailNotifier: case <-quitMailNotifier:
logger.Infof("Ending mail notifier") log.Info("Ending mail notifier")
return return
} }
} }
@ -75,7 +75,10 @@ func buildMail(templateName string, context interface{}) (mailText *bytes.Buffer
} }
mailText = bytes.NewBufferString("") mailText = bytes.NewBufferString("")
t.Execute(mailText, context) if err := t.Execute(mailText, context); err != nil {
log.Errorf("Failed to execute template %s with context %+v: %v", templateName, context, err)
return nil, err
}
return return
} }
@ -108,11 +111,12 @@ func (n *decisionReplyBase) getSubject() string {
type notificationClosedDecision struct { type notificationClosedDecision struct {
notificationBase notificationBase
decisionReplyBase decisionReplyBase
voteSums VoteSums voteSums VoteSums
reasoning string
} }
func NewNotificationClosedDecision(decision *Decision, voteSums *VoteSums) NotificationMail { func NewNotificationClosedDecision(decision *Decision, voteSums *VoteSums, reasoning string) NotificationMail {
notification := &notificationClosedDecision{voteSums: *voteSums} notification := &notificationClosedDecision{voteSums: *voteSums, reasoning: reasoning}
notification.decision = *decision notification.decision = *decision
return notification return notification
} }
@ -123,7 +127,8 @@ func (n *notificationClosedDecision) GetNotificationContent() *notificationConte
data: struct { data: struct {
*Decision *Decision
*VoteSums *VoteSums
}{&n.decision, &n.voteSums}, Reasoning string
}{&n.decision, &n.voteSums, n.reasoning},
subject: fmt.Sprintf("Re: %s - %s - finalised", n.decision.Tag, n.decision.Title), subject: fmt.Sprintf("Re: %s - %s - finalised", n.decision.Tag, n.decision.Title),
headers: n.decisionReplyBase.getHeaders(), headers: n.decisionReplyBase.getHeaders(),
recipients: []recipientData{n.notificationBase.getRecipient()}, recipients: []recipientData{n.notificationBase.getRecipient()},

6
templates/closed_motion_mail.txt
Unescape Escape View File

@ -1,8 +1,10 @@
Dear Board, Dear Board,
{{ with .Decision }}The motion with the identifier {{.Tag}} has been {{.Status}}. {{ with .Decision }}The motion with the identifier {{.Tag}} has been {{.Status}}.{{ end }}
Motion: The reasoning for this result is: {{ .Reasoning }}
{{ with .Decision }}Motion:
{{.Title}} {{.Title}}
{{.Content}} {{.Content}}

Write Preview
Loading…
Cancel
Save