lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-22 02:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

move snax to skynet

Browse Source
This commit is contained in:
Cloud Wu
2017-06-01 12:18:42 +08:00
parent 2be915e3c7
commit 5a4ebe6a73
12 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/cluster1.lua
View File

@@ -1,6 +1,6 @@
local skynet = require "skynet" local skynet = require "skynet"
local cluster = require "skynet.cluster" local cluster = require "skynet.cluster"
local snax = require "snax" local snax = require "skynet.snax"
skynet.start(function() skynet.start(function()
cluster.reload { cluster.reload {

2
examples/share.lua
View File

@@ -1,5 +1,5 @@
local skynet = require "skynet" local skynet = require "skynet"
local sharedata = require "sharedata" local sharedata = require "skynet.sharedata"
local mode = ... local mode = ...

1
lualib/compat10/snax.lua Normal file
View File

@@ -0,0 +1 @@
return require "skynet.snax"

2
lualib/skynet/cluster.lua
View File

@@ -30,7 +30,7 @@ function cluster.proxy(node, name)
end end
function cluster.snax(node, name, address) function cluster.snax(node, name, address)
local snax = require "snax" local snax = require "skynet.snax"
if not address then if not address then
address = cluster.call(node, ".service", "QUERY", "snaxd" , name) address = cluster.call(node, ".service", "QUERY", "snaxd" , name)
end end

0
lualib/snax.lua → lualib/skynet/snax.lua
View File

2
service/console.lua
View File

@@ -1,5 +1,5 @@
local skynet = require "skynet" local skynet = require "skynet"
local snax = require "snax" local snax = require "skynet.snax"
local socket = require "skynet.socket" local socket = require "skynet.socket"
local function split_cmdline(cmdline) local function split_cmdline(cmdline)

2
service/debug_console.lua
View File

@@ -2,7 +2,7 @@ local skynet = require "skynet"
local codecache = require "skynet.codecache" local codecache = require "skynet.codecache"
local core = require "skynet.core" local core = require "skynet.core"
local socket = require "skynet.socket" local socket = require "skynet.socket"
local snax = require "snax" local snax = require "skynet.snax"
local memory = require "skynet.memory" local memory = require "skynet.memory"
local httpd = require "http.httpd" local httpd = require "http.httpd"
local sockethelper = require "http.sockethelper" local sockethelper = require "http.sockethelper"

2
service/service_mgr.lua
View File

@@ -1,6 +1,6 @@
local skynet = require "skynet" local skynet = require "skynet"
require "skynet.manager" -- import skynet.register require "skynet.manager" -- import skynet.register
local snax = require "snax" local snax = require "skynet.snax"
local cmd = {} local cmd = {}
local service = {} local service = {}

2
service/snaxd.lua
View File

@@ -2,7 +2,7 @@ local skynet = require "skynet"
local c = require "skynet.core" local c = require "skynet.core"
local snax_interface = require "snax.interface" local snax_interface = require "snax.interface"
local profile = require "skynet.profile" local profile = require "skynet.profile"
local snax = require "snax" local snax = require "skynet.snax"
local snax_name = tostring(...) local snax_name = tostring(...)
local loaderpath = skynet.getenv"snax_loader" local loaderpath = skynet.getenv"snax_loader"

2
test/pingserver.lua
View File

@@ -1,6 +1,6 @@
local skynet = require "skynet" local skynet = require "skynet"
local queue = require "skynet.queue" local queue = require "skynet.queue"
local snax = require "snax" local snax = require "skynet.snax"
local i = 0 local i = 0
local hello = "hello" local hello = "hello"

2
test/testping.lua
View File

@@ -1,5 +1,5 @@
local skynet = require "skynet" local skynet = require "skynet"
local snax = require "snax" local snax = require "skynet.snax"
skynet.start(function() skynet.start(function()
local ps = snax.newservice ("pingserver", "hello world") local ps = snax.newservice ("pingserver", "hello world")

2
test/testqueue.lua
View File

@@ -1,5 +1,5 @@
local skynet = require "skynet" local skynet = require "skynet"
local snax = require "snax" local snax = require "skynet.snax"
skynet.start(function() skynet.start(function()
local ps = snax.uniqueservice ("pingserver", "test queue") local ps = snax.uniqueservice ("pingserver", "test queue")