fix: log info
This commit is contained in:
@@ -20,7 +20,7 @@ func GenerateTaskUniqueID() string {
|
|||||||
|
|
||||||
// AddSendTaskWithID 添加实例的时候添加任务
|
// AddSendTaskWithID 添加实例的时候添加任务
|
||||||
func AddSendTaskWithID(name string, id string, createdBy string) error {
|
func AddSendTaskWithID(name string, id string, createdBy string) error {
|
||||||
err := db.Where("id = ?", id).Take(&SendTasks{}).Error
|
err := db.Where("id = ?", id).Find(&SendTasks{}).Error
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
+9
-8
@@ -43,7 +43,6 @@ func printOptionValue() {
|
|||||||
func loadConfigFromEnv() {
|
func loadConfigFromEnv() {
|
||||||
AppSetting.JwtSecret = getOptionEnvValue("JWT_SECRET", "message-nest")
|
AppSetting.JwtSecret = getOptionEnvValue("JWT_SECRET", "message-nest")
|
||||||
AppSetting.LogLevel = getOptionEnvValue("LOG_LEVEL", "INFO")
|
AppSetting.LogLevel = getOptionEnvValue("LOG_LEVEL", "INFO")
|
||||||
AppSetting.InitData = getOptionEnvValue("INIT_DATA", "")
|
|
||||||
|
|
||||||
ServerSetting.RunMode = getOptionEnvValue("RUN_MODE", "release")
|
ServerSetting.RunMode = getOptionEnvValue("RUN_MODE", "release")
|
||||||
ServerSetting.HttpPort = 8000
|
ServerSetting.HttpPort = 8000
|
||||||
@@ -52,13 +51,15 @@ func loadConfigFromEnv() {
|
|||||||
|
|
||||||
DatabaseSetting.Type = getOptionEnvValue("DB_TYPE", "sqlite")
|
DatabaseSetting.Type = getOptionEnvValue("DB_TYPE", "sqlite")
|
||||||
|
|
||||||
DatabaseSetting.Host = getMustEnvValue("MYSQL_HOST")
|
if DatabaseSetting.Type == "mysql" {
|
||||||
DatabaseSetting.Port = com.StrTo(getMustEnvValue("MYSQL_PORT")).MustInt()
|
DatabaseSetting.Host = getMustEnvValue("MYSQL_HOST")
|
||||||
DatabaseSetting.User = getMustEnvValue("MYSQL_USER")
|
DatabaseSetting.Port = com.StrTo(getMustEnvValue("MYSQL_PORT")).MustInt()
|
||||||
DatabaseSetting.Password = getMustEnvValue("MYSQL_PASSWORD")
|
DatabaseSetting.User = getMustEnvValue("MYSQL_USER")
|
||||||
DatabaseSetting.Name = getMustEnvValue("MYSQL_DB")
|
DatabaseSetting.Password = getMustEnvValue("MYSQL_PASSWORD")
|
||||||
DatabaseSetting.TablePrefix = getMustEnvValue("MYSQL_TABLE_PREFIX")
|
DatabaseSetting.Name = getMustEnvValue("MYSQL_DB")
|
||||||
DatabaseSetting.SqlDebug = getOptionEnvValue("SQL_DEBUG", "disable")
|
}
|
||||||
|
|
||||||
|
DatabaseSetting.TablePrefix = getOptionEnvValue("MYSQL_TABLE_PREFIX", "message_")
|
||||||
|
DatabaseSetting.SqlDebug = getOptionEnvValue("SQL_DEBUG", "disable")
|
||||||
printOptionValue()
|
printOptionValue()
|
||||||
}
|
}
|
||||||
|
|||||||
+12
-2
@@ -49,10 +49,22 @@ func fileExists(filePath string) bool {
|
|||||||
return !os.IsNotExist(err)
|
return !os.IsNotExist(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func createConfFolder() {
|
||||||
|
// 检查目录是否存在
|
||||||
|
dir := "conf/"
|
||||||
|
if _, err := os.Stat(dir); os.IsNotExist(err) {
|
||||||
|
err := os.MkdirAll(dir, 0755)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Setup initialize the configuration instance
|
// Setup initialize the configuration instance
|
||||||
func Setup() {
|
func Setup() {
|
||||||
var err error
|
var err error
|
||||||
intPath := "conf/app.ini"
|
intPath := "conf/app.ini"
|
||||||
|
createConfFolder()
|
||||||
|
|
||||||
if fileExists(intPath) {
|
if fileExists(intPath) {
|
||||||
log.Printf("[message-nest] start server from %s.", intPath)
|
log.Printf("[message-nest] start server from %s.", intPath)
|
||||||
@@ -72,8 +84,6 @@ func Setup() {
|
|||||||
ServerSetting.ReadTimeout = ServerSetting.ReadTimeout * time.Second
|
ServerSetting.ReadTimeout = ServerSetting.ReadTimeout * time.Second
|
||||||
ServerSetting.WriteTimeout = ServerSetting.WriteTimeout * time.Second
|
ServerSetting.WriteTimeout = ServerSetting.WriteTimeout * time.Second
|
||||||
|
|
||||||
log.Printf("[message-nest] DB type: %s", DatabaseSetting.Type)
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// mapTo map section
|
// mapTo map section
|
||||||
|
|||||||
Reference in New Issue
Block a user