From f854dbf21d3c28d308edd3b6904ab8d3d263872e Mon Sep 17 00:00:00 2001
From: crusader <crusader@loafle.com>
Date: Wed, 21 Mar 2018 20:46:47 +0900
Subject: [PATCH] ing

---
 main.go                                | 31 +++++++++++++++++++++-----
 servlet/webapp/gateway_rpc_handlers.go |  2 +-
 servlet/webapp/subscriber_handlers.go  |  4 +---
 servlet/webapp/webapp.go               |  4 +---
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/main.go b/main.go
index 16eaadd..08d404d 100644
--- a/main.go
+++ b/main.go
@@ -1,18 +1,38 @@
 package main
 
 import (
-	"fmt"
-	"log"
+	"flag"
 	"os"
 	"os/signal"
 	"syscall"
 
+	cc "git.loafle.net/commons_go/config"
 	"git.loafle.net/commons_go/logging"
+	oocc "git.loafle.net/overflow/overflow_commons_go/config"
 	"git.loafle.net/overflow/overflow_gateway_webapp/server"
 	"git.loafle.net/overflow/overflow_gateway_webapp/servlet"
+	oogwc "git.loafle.net/overflow/overflow_gateway_websocket/config"
 	oogws "git.loafle.net/overflow/overflow_gateway_websocket/server"
 )
 
+var (
+	configDir     *string
+	logConfigPath *string
+)
+
+func init() {
+	configDir = oocc.FlagConfigDir("./")
+	logConfigPath = oocc.FlagLogConfigFilePath("")
+	flag.Parse()
+
+	logging.InitializeLogger(*logConfigPath)
+
+	cc.SetConfigPath(*configDir)
+	if err := cc.Load(&oogwc.Config, oocc.ConfigFileName); nil != err {
+		logging.Logger().Panic(err)
+	}
+}
+
 func main() {
 	defer logging.Logger().Sync()
 
@@ -26,16 +46,17 @@ func main() {
 
 	go func() {
 		if err := s.Start(); nil != err {
-			log.Printf("Server: Start error %v", err)
+			logging.Logger().Infof("Server: Start error %v", err)
 			return
 		}
 	}()
 
 	select {
 	case signal := <-stop:
-		fmt.Printf("Got signal: %v\n", signal)
+		logging.Logger().Infof("Got signal: %v\n", signal)
 	}
 
+	servlet.ServletDestroy()
 	s.Stop()
-
+	logging.Logger().Infof("Server stopped")
 }
diff --git a/servlet/webapp/gateway_rpc_handlers.go b/servlet/webapp/gateway_rpc_handlers.go
index ded962c..2759109 100644
--- a/servlet/webapp/gateway_rpc_handlers.go
+++ b/servlet/webapp/gateway_rpc_handlers.go
@@ -77,7 +77,7 @@ func (sh *GatewayRPCHandlers) Handshake(socketCTX cwf.SocketContext, ctx *fastht
 
 	var claims jwt.MapClaims
 	if claims, ok = token.Claims.(jwt.MapClaims); !ok || !token.Valid {
-		logging.Logger().Warn(fmt.Sprintf("Webapp: Token is not valid %v", token))
+		logging.Logger().Warnf("Webapp: Token is not valid %v", token)
 		return "", nil
 	}
 
diff --git a/servlet/webapp/subscriber_handlers.go b/servlet/webapp/subscriber_handlers.go
index 44c1555..3258dce 100644
--- a/servlet/webapp/subscriber_handlers.go
+++ b/servlet/webapp/subscriber_handlers.go
@@ -1,8 +1,6 @@
 package webapp
 
 import (
-	"fmt"
-
 	"git.loafle.net/commons_go/logging"
 	cwf "git.loafle.net/commons_go/websocket_fasthttp"
 	"git.loafle.net/commons_go/websocket_fasthttp/websocket"
@@ -45,7 +43,7 @@ func (sh *SubscriberHandlers) OnSubscribe(channel string, message oos.SubscribeM
 			}
 		}
 	default:
-		logging.Logger().Warn(fmt.Sprintf("[WEBAPP] SubscriberHandler: Unknown TargetType %s", message.TargetType))
+		logging.Logger().Warnf("[WEBAPP] SubscriberHandler: Unknown TargetType %s", message.TargetType)
 	}
 
 }
diff --git a/servlet/webapp/webapp.go b/servlet/webapp/webapp.go
index 5589561..c8b2c63 100644
--- a/servlet/webapp/webapp.go
+++ b/servlet/webapp/webapp.go
@@ -1,8 +1,6 @@
 package webapp
 
 import (
-	"fmt"
-
 	"git.loafle.net/commons_go/logging"
 	oogwc "git.loafle.net/overflow/overflow_gateway_websocket/config"
 	oogws "git.loafle.net/overflow/overflow_gateway_websocket/server"
@@ -20,7 +18,7 @@ var (
 func ServletInit(sh oogws.ServerHandler) {
 	cfg = oogwc.Config.Servlets[Name]
 	if nil == cfg {
-		logging.Logger().Panic(fmt.Sprintf("WebApp: config of servlet[%s] is not exist", Name))
+		logging.Logger().Panicf("WebApp: config of servlet[%s] is not exist", Name)
 	}
 
 	rpcGH := newGatewayRPCHandler()