From f677f49293628d2aa9d5898ce5a6a5d391b1a744 Mon Sep 17 00:00:00 2001 From: Hunter Long Date: Wed, 4 Mar 2020 07:58:42 -0800 Subject: [PATCH] vue --- Dockerfile.base | 2 +- handlers/setup.go | 4 +++- types/checkins/database.go | 3 +-- types/configs/configs_file.go | 2 +- types/configs/file.go | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile.base b/Dockerfile.base index 9aea1b59..e2828d99 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -1,4 +1,4 @@ -FROM golang:1.13.5-alpine +FROM golang:1.14-alpine LABEL maintainer="Hunter Long (https://github.com/hunterlong)" ARG VERSION RUN apk add --update --no-cache libstdc++ gcc g++ make git ca-certificates linux-headers wget curl jq libsass nodejs nodejs-npm diff --git a/handlers/setup.go b/handlers/setup.go index ba6726f7..ee94796e 100644 --- a/handlers/setup.go +++ b/handlers/setup.go @@ -77,7 +77,7 @@ func processSetupHandler(w http.ResponseWriter, r *http.Request) { return } - if _, err = configs.LoadConfigs(); err != nil { + if confg, err = configs.LoadConfigFile(utils.Directory); err != nil { log.Errorln(err) sendErrorJson(err, w, r) return @@ -88,7 +88,9 @@ func processSetupHandler(w http.ResponseWriter, r *http.Request) { if err := confg.Delete(); err != nil { log.Errorln(err) sendErrorJson(err, w, r) + return } + return } if err = confg.MigrateDatabase(); err != nil { diff --git a/types/checkins/database.go b/types/checkins/database.go index 1b517eeb..66cd80cd 100644 --- a/types/checkins/database.go +++ b/types/checkins/database.go @@ -33,11 +33,10 @@ func All() []*Checkin { func (c *Checkin) Create() error { c.ApiKey = utils.RandomString(7) + db := DB().Create(&c) c.Start() go c.CheckinRoutine() - - db := DB().Create(&c) return db.Error() } diff --git a/types/configs/configs_file.go b/types/configs/configs_file.go index 5408f52c..24249852 100644 --- a/types/configs/configs_file.go +++ b/types/configs/configs_file.go @@ -7,7 +7,7 @@ import ( "gopkg.in/yaml.v2" ) -func loadConfigFile(directory string) (*DbConfig, error) { +func LoadConfigFile(directory string) (*DbConfig, error) { var configs *DbConfig log.Infof("Attempting to read config file at: %s/config.yml ", directory) diff --git a/types/configs/file.go b/types/configs/file.go index 03d34475..7e002508 100644 --- a/types/configs/file.go +++ b/types/configs/file.go @@ -40,12 +40,12 @@ func LoadConfigs() (*DbConfig, error) { if dbConn != "" { configs, err := loadConfigEnvs() if err != nil { - return loadConfigFile(utils.Directory) + return LoadConfigFile(utils.Directory) } return configs, nil } - return loadConfigFile(utils.Directory) + return LoadConfigFile(utils.Directory) } func findDbFile(configs *DbConfig) string {