From 9ed869fd3f758a3c5ac8a3d1162ca273c9c48fe3 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Mon, 14 Jan 2019 18:01:15 +0800
Subject: [PATCH] 1

---
 server/dbproxy/CMakeLists.txt | 9 ++++++++-
 server/dbproxy/constant.h     | 2 +-
 server/dbproxy/dbpool.cc      | 2 +-
 server/dbproxy/jsondatamgr.cc | 5 +++--
 third_party/a8engine          | 2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/server/dbproxy/CMakeLists.txt b/server/dbproxy/CMakeLists.txt
index c948cc0..ad3fda3 100644
--- a/server/dbproxy/CMakeLists.txt
+++ b/server/dbproxy/CMakeLists.txt
@@ -1,9 +1,16 @@
 project(dbproxy)
 cmake_minimum_required(VERSION 2.8)
 
+if (${GAME_ID})
+  message(GAME_ID: ${GAME_ID})
+else()
+  set(GAME_ID 1008)
+  message(GAME_ID: ${GAME_ID})
+endif()
+
 set(CMAKE_BUILD_TYPE "Debug")
 set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++11 -fsanitize=address -fno-omit-frame-pointer")
-set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11")
+set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID}")
 
 include_directories(
   AFTER
diff --git a/server/dbproxy/constant.h b/server/dbproxy/constant.h
index 16ebc0a..d73f953 100644
--- a/server/dbproxy/constant.h
+++ b/server/dbproxy/constant.h
@@ -18,6 +18,6 @@ enum NetHandler_e
     HID_DBPool,
 };
 
-const char* const PROJ_NAME = "game1008_dbsproxy";
+const char* const PROJ_NAME = "game" A8_MACRO_STR(GAME_ID) "_dbproxy";
 const char* const PROJ_ROOT = "/data/logs/%s";
 
diff --git a/server/dbproxy/dbpool.cc b/server/dbproxy/dbpool.cc
index cf543bd..3cf02d6 100644
--- a/server/dbproxy/dbpool.cc
+++ b/server/dbproxy/dbpool.cc
@@ -34,7 +34,7 @@ public:
         loop_mutex_ = new std::mutex();
         loop_cond_ = new std::condition_variable();
 
-        gamedb_ = "gamedb1008_1";
+        gamedb_ = a8::Format("gamedb%d_1", {GAME_ID});
         dbhost_ = "127.0.0.1";
         dbuser_ = "root";
         dbpasswd_ = "keji178";
diff --git a/server/dbproxy/jsondatamgr.cc b/server/dbproxy/jsondatamgr.cc
index 1a66d17..58ba622 100644
--- a/server/dbproxy/jsondatamgr.cc
+++ b/server/dbproxy/jsondatamgr.cc
@@ -7,9 +7,10 @@ void JsonDataMgr::Init()
 {
     std::string dbproxyserver_cluster_json_file;
     if (getenv("is_dev_env")) {
-        dbproxyserver_cluster_json_file = "/var/data/conf_test/game1008/dbproxy/game1008.dbproxy.cluster.json";
+        dbproxyserver_cluster_json_file = a8::Format("/var/data/conf_test/game%d/dbproxy/game%d.dbproxy.cluster.json",
+                                                     {GAME_ID, GAME_ID});
     } else {
-        dbproxyserver_cluster_json_file = "../config/game1008.dbproxy.cluster.json";
+        dbproxyserver_cluster_json_file = a8::Format("../config/game%d.dbproxy.cluster.json", {GAME_ID});
     }
     dbproxyserver_cluster_json_.ReadFromFile(dbproxyserver_cluster_json_file);
 }
diff --git a/third_party/a8engine b/third_party/a8engine
index 3d34fc3..ab6f413 160000
--- a/third_party/a8engine
+++ b/third_party/a8engine
@@ -1 +1 @@
-Subproject commit 3d34fc3fbe5e0491010b1224ca655909845f9d7d
+Subproject commit ab6f41321c5925b5a26f4a106f784551a172ecc9