diff --git a/server/tools/scripts/ci/gameserver/manage.py b/server/tools/scripts/ci/gameserver/manage.py index 421c0f8..7715216 100755 --- a/server/tools/scripts/ci/gameserver/manage.py +++ b/server/tools/scripts/ci/gameserver/manage.py @@ -37,7 +37,7 @@ def stop(instance_id, node_id): if cmdline == ("./gameserver\0-i\0%d\0-i\0%d\0" % (instance_id, node_id)): os.popen('kill -9 %d' % int(pid)) -def listserver(): +def listServer(): gameserver_ids = getRuningProgramPids('gameserver') pids = gameserver_ids for pid in pids: @@ -45,14 +45,15 @@ def listserver(): cmdline = getExeCmdLine(pid) print(pid, exepath, cmdline) -def restartServer(str_instance_ids, node_id): +def restartServer(str_instance_ids, str_node_id): instance_ids = str_instance_ids.split(',') + node_id = int(str_node_id) for instance_id in instance_ids: instance_id = int(instance_id) - stop(instance_id) + stop(instance_id, node_id) time.sleep(0.5) print('gameserver %d starting......' % instance_id) - cmd = 'sh start_instance.sh %d' % (instance_id) + cmd = 'sh start_instance.sh %d %d' % (instance_id, node_id) os.popen(cmd) time.sleep(0.5) @@ -68,7 +69,7 @@ def main(argv): elif argv[1] == 'stop': stop(argv[2], argv[3]) elif argv[1] == 'list': - listserver() + listServer() if __name__ == '__main__': main(sys.argv) diff --git a/server/tools/scripts/ci/gameserver/start_instance.sh b/server/tools/scripts/ci/gameserver/start_instance.sh index 88e8a21..1b0ac91 100755 --- a/server/tools/scripts/ci/gameserver/start_instance.sh +++ b/server/tools/scripts/ci/gameserver/start_instance.sh @@ -1,4 +1,4 @@ #!/bin/bash cd bin -nohup ./gameserver -i $1 -n $2>> gameserver$1_$2.out 2>&1 & +nohup ./gameserver -i $1 -n $2>> gameserver$2_$1.out 2>&1 &