second commit

This commit is contained in:
Stian Fredrik Aune
2021-05-22 12:35:27 +02:00
parent 8f648de929
commit dda774f22b
17 changed files with 186 additions and 35 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
package config
import "git.aiterp.net/lucifer/server3/models"
import "git.aiterp.net/lucifer/new-server/models"
var EventChannel = make(chan models.Event, 8)
+29
View File
@@ -0,0 +1,29 @@
package config
import (
"fmt"
_ "github.com/go-sql-driver/mysql"
"github.com/jmoiron/sqlx"
"sync"
)
var dbx *sqlx.DB
var dbLock sync.Mutex
func DBX() *sqlx.DB {
dbLock.Lock()
defer dbLock.Unlock()
if dbx == nil {
dbx = sqlx.MustConnect("mysql", fmt.Sprintf(
"%s:%s@(%s:%d)/%s?parseTime=true",
MySqlUsername(),
MySQlPassword(),
MySqlHost(),
MySqlPort(),
MySqlSchema(),
))
}
return dbx
}
+5 -5
View File
@@ -1,13 +1,13 @@
package config
import "git.aiterp.net/lucifer/server3/models"
import "git.aiterp.net/lucifer/new-server/models"
var dr models.DriverResolver
var dp models.DriverProvider
func DriverResolver() models.DriverResolver {
if dr == nil {
func DriverProvider() models.DriverProvider {
if dp == nil {
panic("not implemented yet")
}
return dr
return dp
}
+6 -5
View File
@@ -5,12 +5,13 @@ import (
"strconv"
)
var MySqlHost = strEnv("LUCIFER_MYSQL_HOST")
var MySqlPort = intEnv("LUCIFER_MYSQL_PORT")
var MySqlUsername = strEnv("LUCIFER_MYSQL_USERNAME")
var MySQlPassword = strEnv("LUCIFER_MYSQL_PASSWORD")
func MySqlHost() string { return strEnv("LUCIFER_MYSQL_HOST") }
func MySqlPort() int { return intEnv("LUCIFER_MYSQL_PORT") }
func MySqlSchema() string { return strEnv("LUCIFER_MYSQL_SCHEMA") }
func MySqlUsername() string { return strEnv("LUCIFER_MYSQL_USERNAME") }
func MySQlPassword() string { return strEnv("LUCIFER_MYSQL_PASSWORD") }
var ServerPort = intEnv("LUCIFER_SERVER_PORT")
func ServerPort() int { return intEnv("LUCIFER_SERVER_PORT") }
func strEnv(key string) string {
env, ok := os.LookupEnv(key)
+1 -1
View File
@@ -1,6 +1,6 @@
package config
import "git.aiterp.net/lucifer/server3/models"
import "git.aiterp.net/lucifer/new-server/models"
var (
dRepo models.DeviceRepository