lib conf
This commit is contained in:
		
							
								
								
									
										6
									
								
								conf.go
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								conf.go
									
									
									
									
									
								
							@@ -12,7 +12,6 @@ type Config struct {
 | 
				
			|||||||
	MongoURL string
 | 
						MongoURL string
 | 
				
			||||||
	DCNAME   string
 | 
						DCNAME   string
 | 
				
			||||||
	DBPOINT  string
 | 
						DBPOINT  string
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var instance *Config
 | 
					var instance *Config
 | 
				
			||||||
@@ -24,3 +23,8 @@ func GetConfig() *Config {
 | 
				
			|||||||
	})
 | 
						})
 | 
				
			||||||
	return instance
 | 
						return instance
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func SetConfig(config *Config) *Config {
 | 
				
			||||||
 | 
						instance = config
 | 
				
			||||||
 | 
						return instance
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -30,7 +30,6 @@ func init() {
 | 
				
			|||||||
	// var baseConfig string
 | 
						// var baseConfig string
 | 
				
			||||||
	var err error
 | 
						var err error
 | 
				
			||||||
	var conf map[string]string
 | 
						var conf map[string]string
 | 
				
			||||||
	var MongoURL string
 | 
					 | 
				
			||||||
	var DBname string
 | 
						var DBname string
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ResourceMap = make(map[string]interface{})
 | 
						ResourceMap = make(map[string]interface{})
 | 
				
			||||||
@@ -43,23 +42,17 @@ func init() {
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
	json.Unmarshal(db_conf, &conf)
 | 
						json.Unmarshal(db_conf, &conf)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if len(os.Getenv("DOCKER_ENVIRONMENT")) == 0 {
 | 
						DBname = lib.GetConfig().DCNAME + "-" + lib.GetConfig().DBPOINT
 | 
				
			||||||
		MongoURL = conf["DB_URL_LOCAL"]
 | 
					 | 
				
			||||||
	} else {
 | 
					 | 
				
			||||||
		MongoURL = conf["DB_URL_DOCKER"]
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	DBname = conf["DCNAME"] + "-" + conf["DBPOINT"]
 | 
						lib.Logger.Info().Msg("Connecting to" + lib.GetConfig().MongoURL)
 | 
				
			||||||
 | 
					 | 
				
			||||||
	lib.Logger.Info().Msg("Connecting to" + MongoURL)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	MngoCtx, cancel = context.WithTimeout(context.Background(), 10*time.Second)
 | 
						MngoCtx, cancel = context.WithTimeout(context.Background(), 10*time.Second)
 | 
				
			||||||
	defer cancel()
 | 
						defer cancel()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	createClient(MongoURL)
 | 
						createClient(lib.GetConfig().MongoURL)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	lib.Logger.Info().Msg("Connecting mongo client to db " + DBname)
 | 
						lib.Logger.Info().Msg("Connecting mongo client to db " + DBname)
 | 
				
			||||||
	prepareDB(conf["DCNAME"], conf["DBPOINT"])
 | 
						prepareDB(lib.GetConfig().DCNAME, lib.GetConfig().DBPOINT)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	lib.Logger.Info().Msg("Database is READY")
 | 
						lib.Logger.Info().Msg("Database is READY")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user