Restoring ignored file changes
Also deleted a file I missed
This commit is contained in:
parent
d1fd5f68e7
commit
3f71d75a99
6
.gitignore
vendored
6
.gitignore
vendored
@ -254,8 +254,8 @@ paket-files/
|
|||||||
|
|
||||||
# Compiled files / application
|
# Compiled files / application
|
||||||
src/api/build
|
src/api/build
|
||||||
src/public/index.html
|
src/api/MyPrayerJournal.Api/wwwroot/index.html
|
||||||
src/public/static
|
src/api/MyPrayerJournal.Api/wwwroot/static
|
||||||
src/config.json
|
src/api/MyPrayerJournal.Api/appsettings.development.json
|
||||||
/build
|
/build
|
||||||
src/*.exe
|
src/*.exe
|
||||||
|
@ -1,48 +0,0 @@
|
|||||||
// myPrayerJournal API Server
|
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"log"
|
|
||||||
"net/http"
|
|
||||||
"os"
|
|
||||||
|
|
||||||
"github.com/danieljsummers/myPrayerJournal/src/api/data"
|
|
||||||
"github.com/danieljsummers/myPrayerJournal/src/api/routes"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Web contains configuration for the web server.
|
|
||||||
type Web struct {
|
|
||||||
Port string `json:"port"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Settings contains configuration for the myPrayerJournal API.
|
|
||||||
type Settings struct {
|
|
||||||
Data *data.Settings `json:"data"`
|
|
||||||
Web *Web `json:"web"`
|
|
||||||
Auth *routes.AuthConfig `json:"auth"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// readSettings parses the JSON configuration file into the Settings struct.
|
|
||||||
func readSettings(f string) *Settings {
|
|
||||||
config, err := os.Open(f)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal(err)
|
|
||||||
}
|
|
||||||
defer config.Close()
|
|
||||||
settings := Settings{}
|
|
||||||
if err = json.NewDecoder(config).Decode(&settings); err != nil {
|
|
||||||
log.Fatal(err)
|
|
||||||
}
|
|
||||||
return &settings
|
|
||||||
}
|
|
||||||
|
|
||||||
func main() {
|
|
||||||
cfg := readSettings("config.json")
|
|
||||||
if ok := data.Connect(cfg.Data); !ok {
|
|
||||||
log.Fatal("Unable to connect to database; exiting")
|
|
||||||
}
|
|
||||||
data.EnsureDB()
|
|
||||||
log.Printf("myPrayerJournal API listening on %s", cfg.Web.Port)
|
|
||||||
log.Fatal(http.ListenAndServe(cfg.Web.Port, routes.NewRouter(cfg.Auth)))
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user