wasteland / server

Compare View

switch
from
...
to
 
Commits (2)
Showing 6 changed files   Show diff stats
Inline Side-by-side
1 root = "./" 1 root = "./"
2 -logger = "server.log" 2 +--logger = "server.log"
3 --logger = "services/errorlog" 3 --logger = "services/errorlog"
4 -logservice = "snlua" 4 +--logservice = "snlua"
5 5
6 harbor = 0 6 harbor = 0
7 start = "main" -- main script 7 start = "main" -- main script
@@ -25,8 +25,6 @@ max_queue = 500 @@ -25,8 +25,6 @@ max_queue = 500
25 redis_db = 0 25 redis_db = 0
26 redis_auth = "H3&Gm4MGhcPui%a" 26 redis_auth = "H3&Gm4MGhcPui%a"
27 27
28 -redis_host = "127.0.0.1"  
29 -  
30 mysql_host = "rm-bp1p5518oj8boxzci2o.mysql.rds.aliyuncs.com" 28 mysql_host = "rm-bp1p5518oj8boxzci2o.mysql.rds.aliyuncs.com"
31 mysql_port = 3306 29 mysql_port = 3306
32 mysql_user = "zhaolu" 30 mysql_user = "zhaolu"
config/production.lua
  Show/Hide comments   View file @9041a99
1 include("basic.lua") 1 include("basic.lua")
2 2
3 -logd = 0 -- 是否开启日志 3 +logd = 1 -- 是否开启日志
4 thread = 4 4 thread = 4
5 codeurl = "127.0.0.1:9001" 5 codeurl = "127.0.0.1:9001"
6 servId = 1 6 servId = 1
config/server0.lua
  Show/Hide comments   View file @9041a99
1 include("basic.lua") 1 include("basic.lua")
  2 +logger = "/mnt/log/gameserver/server_0.log"
2 3
3 4
4 servId = 0 5 servId = 0
5 server_port = 10000 6 server_port = 10000
6 httpweb_port = 11000 7 httpweb_port = 11000
7 debug_port = 12000 8 debug_port = 12000
  9 +
  10 +redis_host = "172.16.83.194"
8 redis_port = 6100 11 redis_port = 6100
config/server1.lua
  Show/Hide comments   View file @9041a99
@@ -5,4 +5,6 @@ servId = 1 @@ -5,4 +5,6 @@ servId = 1
5 server_port = 10001 5 server_port = 10001
6 httpweb_port = 11001 6 httpweb_port = 11001
7 debug_port = 12001 7 debug_port = 12001
  8 +
  9 +redis_host = "172.16.83.194"
8 redis_port = 6001 10 redis_port = 6001
1 -Subproject commit 3fe1beb0f0efedddb79ccfac950b8eeca98f9c91 1 +Subproject commit 6e3e08c1ab1287759b803fc7400efefb979a31d4
src/services/logd.lua
  Show/Hide comments   View file @9041a99
@@ -20,11 +20,11 @@ local prefix = "wasteland" .. logdIdx .. "S" .. serverId .. "C" @@ -20,11 +20,11 @@ local prefix = "wasteland" .. logdIdx .. "S" .. serverId .. "C"
20 local logHandle = { 20 local logHandle = {
21 bi = { 21 bi = {
22 host = "127.0.0.1", 22 host = "127.0.0.1",
23 - port = 13001, 23 + port = 14001,
24 }, 24 },
25 log = { 25 log = {
26 host = "127.0.0.1", 26 host = "127.0.0.1",
27 - port = 13002, 27 + port = 14002,
28 handle = function(doc) 28 handle = function(doc)
29 -- 注入字段 29 -- 注入字段
30 local now = skynet.timex() 30 local now = skynet.timex()