Commit 759669cc5a85f3632bd5f20ef456318aa0b491f9
1 parent
c873abb5
报错
Showing
2 changed files
with
3 additions
and
2 deletions
Show diff stats
publish/publish.sh
| @@ -28,7 +28,7 @@ cd - | @@ -28,7 +28,7 @@ cd - | ||
| 28 | rsync -aP --exclude=".git" ./src/ ${dist}/src/ | 28 | rsync -aP --exclude=".git" ./src/ ${dist}/src/ |
| 29 | rsync -aP ./publish/skynet ${dist}/ | 29 | rsync -aP ./publish/skynet ${dist}/ |
| 30 | rsync -aP --exclude={config/develop.lua,config/nodenames.lua} config ${dist}/ | 30 | rsync -aP --exclude={config/develop.lua,config/nodenames.lua} config ${dist}/ |
| 31 | -#cp kill.sh ${dist}/ | ||
| 32 | -#cp run.sh ${dist}/ | 31 | +cp kill.sh ${dist}/ |
| 32 | +cp run.sh ${dist}/ | ||
| 33 | 33 | ||
| 34 | # rsync -aP --exclude-from="./publish/exclude.list" ${origin}/ ./${dist}/ | 34 | # rsync -aP --exclude-from="./publish/exclude.list" ${origin}/ ./${dist}/ |
src/services/watchdog.lua
| @@ -37,6 +37,7 @@ function SOCKET.error(fd, msg) | @@ -37,6 +37,7 @@ function SOCKET.error(fd, msg) | ||
| 37 | end | 37 | end |
| 38 | 38 | ||
| 39 | function SOCKET.data(fd, msg) | 39 | function SOCKET.data(fd, msg) |
| 40 | + if #msg < 2 then return end | ||
| 40 | local cmd = string.unpack("H", string.sub(msg, 1, 2)) | 41 | local cmd = string.unpack("H", string.sub(msg, 1, 2)) |
| 41 | if cmd == actionCodes.Role_queryLoginRpc then | 42 | if cmd == actionCodes.Role_queryLoginRpc then |
| 42 | local data = MsgPack.unpack(xxtea.decrypt(string.sub(msg, 3), XXTEA_KEY)) | 43 | local data = MsgPack.unpack(xxtea.decrypt(string.sub(msg, 3), XXTEA_KEY)) |