Merge pull request #46 from rebill/master

change google code to github
Terry-Mao · Jun 15, 2016 · d9cbf9e · d9cbf9e
2 parents 07a2455 + 0d581a9
commit d9cbf9e
Show file tree

Hide file tree

Showing 35 changed files with 38 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,5 @@ _cgo_export.*
 _testmain.go
 
 *.exe
+
+.idea
diff --git a/comet/channel.go b/comet/channel.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"errors"
 	"github.com/Terry-Mao/gopush-cluster/hash"
 	"github.com/Terry-Mao/gopush-cluster/hlist"

diff --git a/comet/conn.go b/comet/conn.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"fmt"
 	"net"
 )

diff --git a/comet/main.go b/comet/main.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"flag"
 	"github.com/Terry-Mao/gopush-cluster/perf"
 	"github.com/Terry-Mao/gopush-cluster/process"

diff --git a/comet/pubsub.go b/comet/pubsub.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"errors"
 	"time"
 )

diff --git a/comet/pubsub_tcp.go b/comet/pubsub_tcp.go
@@ -18,7 +18,7 @@ package main
 
 import (
 	"bufio"
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"errors"
 	"io"
 	"net"

diff --git a/comet/pubsub_websocket.go b/comet/pubsub_websocket.go
@@ -18,8 +18,8 @@ package main
 
 import (
 	// TODO change the 3rd websocket lib
-	"code.google.com/p/go.net/websocket"
-	log "code.google.com/p/log4go"
+	"github.com/golang/net/websocket"
+	log "github.com/alecthomas/log4go"
 	"net"
 	"net/http"
 	"strconv"

diff --git a/comet/rpc.go b/comet/rpc.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"errors"
 	"github.com/Terry-Mao/gopush-cluster/id"
 	myrpc "github.com/Terry-Mao/gopush-cluster/rpc"

diff --git a/comet/seq_channel.go b/comet/seq_channel.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"errors"
 	"github.com/Terry-Mao/gopush-cluster/hlist"
 	"github.com/Terry-Mao/gopush-cluster/id"

diff --git a/comet/signal.go b/comet/signal.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"os"
 	"os/signal"
 	"syscall"

diff --git a/comet/stat.go b/comet/stat.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"encoding/json"
 	"net/http"
 	"os"

diff --git a/comet/token.go b/comet/token.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"container/list"
 	"errors"
 	"time"

diff --git a/comet/zk.go b/comet/zk.go
@@ -21,7 +21,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"encoding/json"
 	"github.com/Terry-Mao/gopush-cluster/rpc"
 	myzk "github.com/Terry-Mao/gopush-cluster/zk"

diff --git a/dependencies.sh b/dependencies.sh
@@ -4,9 +4,9 @@
 go get -u github.com/Terry-Mao/gopush-cluster
 go get -u github.com/Terry-Mao/goconf
 go get -u github.com/garyburd/redigo/redis
-go get -u code.google.com/p/go.net/websocket
+go get -u github.com/golang/net/websocket
 go get -u github.com/samuel/go-zookeeper
-go get -u code.google.com/p/log4go
+go get -u github.com/alecthomas/log4go
 go get -u github.com/go-sql-driver/mysql
 
 #go get -u ./message/...

diff --git a/message/main.go b/message/main.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"flag"
 	"github.com/Terry-Mao/gopush-cluster/perf"
 	"github.com/Terry-Mao/gopush-cluster/process"

diff --git a/message/mysql.go b/message/mysql.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"database/sql"
 	"encoding/json"
 	"errors"

diff --git a/message/redis.go b/message/redis.go
@@ -25,7 +25,7 @@ import (
 	"strings"
 	"time"
 
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"github.com/Terry-Mao/gopush-cluster/ketama"
 	myrpc "github.com/Terry-Mao/gopush-cluster/rpc"
 	"github.com/garyburd/redigo/redis"

diff --git a/message/rpc.go b/message/rpc.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	myrpc "github.com/Terry-Mao/gopush-cluster/rpc"
 	"net"
 	"net/rpc"

diff --git a/message/signal.go b/message/signal.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"os"
 	"os/signal"
 	"syscall"

diff --git a/message/storage.go b/message/storage.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"encoding/json"
 	"errors"
 	"github.com/Terry-Mao/gopush-cluster/rpc"

diff --git a/message/zk.go b/message/zk.go
@@ -21,7 +21,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"encoding/json"
 	"github.com/Terry-Mao/gopush-cluster/rpc"
 	myzk "github.com/Terry-Mao/gopush-cluster/zk"

diff --git a/perf/perf.go b/perf/perf.go
@@ -17,7 +17,7 @@
 package perf
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"net/http"
 	"net/http/pprof"
 )

diff --git a/rpc/comet.go b/rpc/comet.go
@@ -17,7 +17,7 @@
 package rpc
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"encoding/json"
 	"errors"
 	"github.com/Terry-Mao/gopush-cluster/ketama"

diff --git a/rpc/message.go b/rpc/message.go
@@ -17,7 +17,7 @@
 package rpc
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"encoding/json"
 	myzk "github.com/Terry-Mao/gopush-cluster/zk"
 	"github.com/samuel/go-zookeeper/zk"

diff --git a/rpc/rand_lb.go b/rpc/rand_lb.go
@@ -17,7 +17,7 @@
 package rpc
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"errors"
 	"fmt"
 	"math/rand"

diff --git a/test/comet/config.go b/test/comet/config.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"errors"
 	"flag"
 	"github.com/Terry-Mao/goconf"

diff --git a/test/comet/main.go b/test/comet/main.go
@@ -18,7 +18,7 @@ package main
 
 import (
 	"bufio"
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"flag"
 	"fmt"
 	"net"

diff --git a/web/admin.go b/web/admin.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"encoding/json"
 	myrpc "github.com/Terry-Mao/gopush-cluster/rpc"
 	"io/ioutil"

diff --git a/web/handle.go b/web/handle.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	myrpc "github.com/Terry-Mao/gopush-cluster/rpc"
 	"net/http"
 	"strconv"

diff --git a/web/handle_1.0.go b/web/handle_1.0.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	myrpc "github.com/Terry-Mao/gopush-cluster/rpc"
 	"net/http"
 	"strconv"

diff --git a/web/http.go b/web/http.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"encoding/json"
 	"fmt"
 	"net"

diff --git a/web/main.go b/web/main.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"flag"
 	"github.com/Terry-Mao/gopush-cluster/perf"
 	"github.com/Terry-Mao/gopush-cluster/process"

diff --git a/web/signal.go b/web/signal.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"os"
 	"os/signal"
 	"syscall"

diff --git a/web/zk.go b/web/zk.go
@@ -17,7 +17,7 @@
 package main
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	myrpc "github.com/Terry-Mao/gopush-cluster/rpc"
 	myzk "github.com/Terry-Mao/gopush-cluster/zk"
 	"github.com/samuel/go-zookeeper/zk"

diff --git a/zk/zk.go b/zk/zk.go
@@ -21,7 +21,7 @@
 package zk
 
 import (
-	log "code.google.com/p/log4go"
+	log "github.com/alecthomas/log4go"
 	"errors"
 	"github.com/samuel/go-zookeeper/zk"
 	"os"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,3 +20,5 @@ _cgo_export.*
		_testmain.go

		*.exe

		.idea
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ package main @@
     import (
     	"bufio"
-    	log "code.google.com/p/log4go"
+    	log "github.com/alecthomas/log4go"
     	"flag"
     	"fmt"
     	"net"
@@ Expand Down @@