diff --git a/config/basic.lua b/config/basic.lua index 4f3ca50..5ea7107 100644 --- a/config/basic.lua +++ b/config/basic.lua @@ -1,7 +1,7 @@ root = "./" -logger = "server.log" +--logger = "server.log" --logger = "services/errorlog" -logservice = "snlua" +--logservice = "snlua" harbor = 0 start = "main" -- main script @@ -25,8 +25,6 @@ max_queue = 500 redis_db = 0 redis_auth = "H3&Gm4MGhcPui%a" -redis_host = "127.0.0.1" - mysql_host = "rm-bp1p5518oj8boxzci2o.mysql.rds.aliyuncs.com" mysql_port = 3306 mysql_user = "zhaolu" diff --git a/config/production.lua b/config/production.lua index cbba90a..0fac1f7 100644 --- a/config/production.lua +++ b/config/production.lua @@ -1,6 +1,6 @@ include("basic.lua") -logd = 0 -- 是否开启日志 +logd = 1 -- 是否开启日志 thread = 4 codeurl = "127.0.0.1:9001" servId = 1 diff --git a/config/server0.lua b/config/server0.lua index 3a37ad7..951a742 100755 --- a/config/server0.lua +++ b/config/server0.lua @@ -1,8 +1,11 @@ include("basic.lua") +logger = "/mnt/log/gameserver/server_0.log" servId = 0 server_port = 10000 httpweb_port = 11000 debug_port = 12000 + +redis_host = "172.16.83.194" redis_port = 6100 diff --git a/config/server1.lua b/config/server1.lua index 4021cc6..be88a06 100755 --- a/config/server1.lua +++ b/config/server1.lua @@ -5,4 +5,6 @@ servId = 1 server_port = 10001 httpweb_port = 11001 debug_port = 12001 + +redis_host = "172.16.83.194" redis_port = 6001 diff --git a/src/csvdata b/src/csvdata index 3fe1beb..6e3e08c 160000 --- a/src/csvdata +++ b/src/csvdata @@ -1 +1 @@ -Subproject commit 3fe1beb0f0efedddb79ccfac950b8eeca98f9c91 +Subproject commit 6e3e08c1ab1287759b803fc7400efefb979a31d4 diff --git a/src/services/logd.lua b/src/services/logd.lua index 2436a06..9f1bb62 100644 --- a/src/services/logd.lua +++ b/src/services/logd.lua @@ -20,11 +20,11 @@ local prefix = "wasteland" .. logdIdx .. "S" .. serverId .. "C" local logHandle = { bi = { host = "127.0.0.1", - port = 13001, + port = 14001, }, log = { host = "127.0.0.1", - port = 13002, + port = 14002, handle = function(doc) -- 注入字段 local now = skynet.timex() -- libgit2 0.21.2