From 8a6243d2a04186b2f1310b3fceecab834b3fc1e1 Mon Sep 17 00:00:00 2001
From: Cloud Wu <cloudwu@gmail.com>
Date: Thu, 1 Jun 2017 10:51:02 +0800
Subject: [PATCH] rename socket to skynet.socket

---
 lualib/http/sockethelper.lua | 2 +-
 lualib/snax/loginserver.lua  | 2 +-
 service/clusterd.lua         | 4 ++--
 service/cmaster.lua          | 2 +-
 service/console.lua          | 2 +-
 service/cslave.lua           | 2 +-
 service/debug_console.lua    | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lualib/http/sockethelper.lua b/lualib/http/sockethelper.lua
index 0ae6445d..f5d6ae80 100644
--- a/lualib/http/sockethelper.lua
+++ b/lualib/http/sockethelper.lua
@@ -1,4 +1,4 @@
-local socket = require "socket"
+local socket = require "skynet.socket"
 local skynet = require "skynet"
 
 local readbytes = socket.read
diff --git a/lualib/snax/loginserver.lua b/lualib/snax/loginserver.lua
index cd74fcb5..9ac39090 100644
--- a/lualib/snax/loginserver.lua
+++ b/lualib/snax/loginserver.lua
@@ -1,6 +1,6 @@
 local skynet = require "skynet"
 require "skynet.manager"
-local socket = require "socket"
+local socket = require "skynet.socket"
 local crypt = require "crypt"
 local table = table
 local string = string
diff --git a/service/clusterd.lua b/service/clusterd.lua
index 911b27d1..1a34c45f 100644
--- a/service/clusterd.lua
+++ b/service/clusterd.lua
@@ -1,6 +1,6 @@
 local skynet = require "skynet"
-local sc = require "socketchannel"
-local socket = require "socket"
+local sc = require "skynet.socketchannel"
+local socket = require "skynet.socket"
 local cluster = require "cluster.core"
 
 local config_name = skynet.getenv "cluster"
diff --git a/service/cmaster.lua b/service/cmaster.lua
index eeb9461e..91c75b4b 100644
--- a/service/cmaster.lua
+++ b/service/cmaster.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local socket = require "socket"
+local socket = require "skynet.socket"
 
 --[[
 	master manage data :
diff --git a/service/console.lua b/service/console.lua
index e0ce1453..f7d1c6bf 100644
--- a/service/console.lua
+++ b/service/console.lua
@@ -1,6 +1,6 @@
 local skynet = require "skynet"
 local snax   = require "snax"
-local socket = require "socket"
+local socket = require "skynet.socket"
 
 local function split_cmdline(cmdline)
 	local split = {}
diff --git a/service/cslave.lua b/service/cslave.lua
index 559d02b3..452dbaf2 100644
--- a/service/cslave.lua
+++ b/service/cslave.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local socket = require "socket"
+local socket = require "skynet.socket"
 require "skynet.manager"	-- import skynet.launch, ...
 local table = table
 
diff --git a/service/debug_console.lua b/service/debug_console.lua
index ec4ea482..81042286 100644
--- a/service/debug_console.lua
+++ b/service/debug_console.lua
@@ -1,7 +1,7 @@
 local skynet = require "skynet"
 local codecache = require "skynet.codecache"
 local core = require "skynet.core"
-local socket = require "socket"
+local socket = require "skynet.socket"
 local snax = require "snax"
 local memory = require "memory"
 local httpd = require "http.httpd"