Merge pull request #5 from CastyLab/develop

Loading database, oauth and jwt configurations in main file

Dockerfile

@@ -17,12 +17,13 @@ RUN mkdir /code
 # Adding project to work directory
 ADD . /code
 
+RUN mkdir /config
+
 # Removing old JWT keys
-RUN rm -rf /code/config/jwt.key\
-    /code/config/jwt.pub
+RUN rm -rf /config/jwt.key /config/jwt.pub
 
 # Generate jwt keys
-RUN cd /code/config && ssh-keygen -t rsa -N '' -b 4096 -m PEM -f jwt.key &&\
+RUN cd /config && ssh-keygen -t rsa -N '' -b 4096 -m PEM -f jwt.key &&\
     openssl rsa -in jwt.key -pubout -outform PEM -out jwt.pub;
 
 # Choosing work directory
@@ -33,4 +34,5 @@ RUN go build -o casty.gRPC.server .
 
 EXPOSE 55283
 
-CMD ["./casty.gRPC.server", "-port", "55283"]
+ENTRYPOINT ["./casty.gRPC.server"]
+CMD ["--port", "55283"]

config/config.go

@@ -1,7 +1,6 @@
 package config
 
 import (
-	"flag"
 	"fmt"
 	"gopkg.in/yaml.v2"
 	"log"
@@ -44,17 +43,16 @@ type ConfMap struct {
 	StoragePath string `yaml:"storage_path"`
 }
 
-var Map *ConfMap
+var Map = new(ConfMap)
 
-func init() {
-	configFileName := flag.String("config-file", "config.yml", "config.yaml file")
-	flag.Parse()
-	file, err := os.Open(*configFileName)
+func Load(filename string) error {
+	file, err := os.Open(filename)
 	if err != nil {
-		log.Fatal(fmt.Sprintf("could not open config.yml file : %v", err))
+		return fmt.Errorf("could not open config file: %v", err)
 	}
 	if err := yaml.NewDecoder(file).Decode(&Map); err != nil {
-		log.Fatal(fmt.Sprintf("could not decode config file : %v", err))
+		return fmt.Errorf("could not decode config file: %v", err)
 	}
 	log.Printf("ConfigMap Loaded: [version: %s]", Map.App.Version)
+	return nil
 }

db/init.go

@@ -6,15 +6,14 @@ import (
 	"github.com/CastyLab/grpc.server/config"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-	"log"
 	"time"
 )
 
 var (
 	Connection *mongo.Database
 )
 
-func init() {
+func Configure() error {
 
 	ctx, _ := context.WithTimeout(context.Background(), 20 * time.Second)
 
@@ -28,12 +27,13 @@ func init() {
 
 	client, err := mongo.NewClient(opts)
 	if err != nil {
-		log.Fatal(err)
+		return fmt.Errorf("could not create new mongodb client: %v", err)
 	}
 
 	if err := client.Connect(ctx); err != nil {
-		log.Fatal(err)
+		return fmt.Errorf("could not connect to mongodb client: %v", err)
 	}
 
 	Connection = client.Database(config.Map.Secrets.Db.Name)
+	return nil
 }