Swagger-baser server REST API interface

[ric-plt/appmgr.git] / pkg / appmgr / appmgr.go

diff --git a/cmd/appmgr/config.go b/pkg/appmgr/appmgr.go
similarity index 75%
rename from cmd/appmgr/config.go
rename to pkg/appmgr/appmgr.go
index 5e1975e..28e98f9 100755 (executable)
--- a/cmd/appmgr/config.go
+++ b/pkg/appmgr/appmgr.go
@@ -17,16 +17,27 @@
 ==================================================================================
 */
 
-package main
+package appmgr
 
 import (
        "flag"
+       "gerrit.oran-osc.org/r/ric-plt/appmgr/pkg/logger"
        "github.com/fsnotify/fsnotify"
        "github.com/spf13/viper"
        "log"
+       "net/http"
 )
 
-const DEFAULT_CONFIG_FILE = "config/appmgr.yaml"
+const DEFAULT_CONFIG_FILE = "../../config/appmgr.yaml"
+
+var Logger *logger.Log
+
+func LogRestRequests(inner http.Handler) http.Handler {
+       return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+               inner.ServeHTTP(w, r)
+               Logger.Info("Logger: method=%s url=%s", r.Method, r.URL.RequestURI())
+       })
+}
 
 func parseCmd() string {
        var fileName *string
@@ -36,9 +47,15 @@ func parseCmd() string {
        return *fileName
 }
 
+func watch() {
+       viper.WatchConfig()
+       viper.OnConfigChange(func(e fsnotify.Event) {
+               log.Println("config file changed ", e.Name)
+       })
+}
+
 func loadConfig() {
        viper.SetConfigFile(parseCmd())
-
        if err := viper.ReadInConfig(); err != nil {
                log.Fatalf("Error reading config file, %s", err)
        }
@@ -48,9 +65,8 @@ func loadConfig() {
        watch()
 }
 
-func watch() {
-       viper.WatchConfig()
-       viper.OnConfigChange(func(e fsnotify.Event) {
-               log.Println("config file changed ", e.Name)
-       })
+func Init() {
+       loadConfig()
+       Logger = logger.NewLogger("appmgr")
+       Logger.SetMdc("xm", "0.2.0")
 }