move snax to skynet

OzymandiasKing · Jun 1, 2017 · 5a4ebe6 · 5a4ebe6
1 parent 2be915e
commit 5a4ebe6
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 10 deletions.
diff --git a/examples/cluster1.lua b/examples/cluster1.lua
@@ -1,6 +1,6 @@
 local skynet = require "skynet"
 local cluster = require "skynet.cluster"
-local snax = require "snax"
+local snax = require "skynet.snax"
 
 skynet.start(function()
 	cluster.reload {

diff --git a/examples/share.lua b/examples/share.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local sharedata = require "sharedata"
+local sharedata = require "skynet.sharedata"
 
 local mode = ...
 

diff --git a/lualib/compat10/snax.lua b/lualib/compat10/snax.lua
@@ -0,0 +1 @@
+return require "skynet.snax"
diff --git a/lualib/skynet/cluster.lua b/lualib/skynet/cluster.lua
@@ -30,7 +30,7 @@ function cluster.proxy(node, name)
 end
 
 function cluster.snax(node, name, address)
-	local snax = require "snax"
+	local snax = require "skynet.snax"
 	if not address then
 		address = cluster.call(node, ".service", "QUERY", "snaxd" , name)
 	end

diff --git a/lualib/snax.lua → lualib/skynet/snax.lua b/lualib/snax.lua → lualib/skynet/snax.lua
diff --git a/service/console.lua b/service/console.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local snax   = require "snax"
+local snax   = require "skynet.snax"
 local socket = require "skynet.socket"
 
 local function split_cmdline(cmdline)

diff --git a/service/debug_console.lua b/service/debug_console.lua
@@ -2,7 +2,7 @@ local skynet = require "skynet"
 local codecache = require "skynet.codecache"
 local core = require "skynet.core"
 local socket = require "skynet.socket"
-local snax = require "snax"
+local snax = require "skynet.snax"
 local memory = require "skynet.memory"
 local httpd = require "http.httpd"
 local sockethelper = require "http.sockethelper"

diff --git a/service/service_mgr.lua b/service/service_mgr.lua
@@ -1,6 +1,6 @@
 local skynet = require "skynet"
 require "skynet.manager"	-- import skynet.register
-local snax = require "snax"
+local snax = require "skynet.snax"
 
 local cmd = {}
 local service = {}

diff --git a/service/snaxd.lua b/service/snaxd.lua
@@ -2,7 +2,7 @@ local skynet = require "skynet"
 local c = require "skynet.core"
 local snax_interface = require "snax.interface"
 local profile = require "skynet.profile"
-local snax = require "snax"
+local snax = require "skynet.snax"
 
 local snax_name = tostring(...)
 local loaderpath = skynet.getenv"snax_loader"

diff --git a/test/pingserver.lua b/test/pingserver.lua
@@ -1,6 +1,6 @@
 local skynet = require "skynet"
 local queue = require "skynet.queue"
-local snax = require "snax"
+local snax = require "skynet.snax"
 
 local i = 0
 local hello = "hello"

diff --git a/test/testping.lua b/test/testping.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local snax = require "snax"
+local snax = require "skynet.snax"
 
 skynet.start(function()
 	local ps = snax.newservice ("pingserver", "hello world")

diff --git a/test/testqueue.lua b/test/testqueue.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local snax = require "snax"
+local snax = require "skynet.snax"
 
 skynet.start(function()
 	local ps = snax.uniqueservice ("pingserver", "test queue")