rollback to central lib

collector/collector.go

@@ -4,12 +4,12 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	cron "github.com/niean/cron"
-	nhttpclient "github.com/niean/gotools/http/httpclient"
 	"github.com/open-falcon/common/model"
 	"github.com/open-falcon/task/g"
 	"github.com/open-falcon/task/proc"
 	sema "github.com/toolkits/concurrent/semaphore"
+	cron "github.com/toolkits/cron"
+	nhttpclient "github.com/toolkits/http/httpclient"
 	"io/ioutil"
 	"log"
 	"net/http"

g/g.go

@@ -10,7 +10,7 @@ import (
 // 0.0.3: add readme, add gitversion, modify proc, add config reload
 // 0.0.4: make collector configurable, add monitor cron, adjust index db
 // Changes: send turning-ok only after alarm happens, add conn timeout for http
-//			maybe fix bug of 'too many open files'
+//			maybe fix bug of 'too many open files', rollback to central lib
 const (
 	VERSION = "0.0.4"
 )

g/git.go

@@ -1,4 +1,4 @@
 package g
 const (
-    COMMIT = "41e56f8"
+    COMMIT = "651b76b"
 )

index/index_delete_task.go

@@ -1,10 +1,10 @@
 package index
 
 import (
-	cron "github.com/niean/cron"
 	Mdb "github.com/open-falcon/common/db"
 	"github.com/open-falcon/task/proc"
 	TSemaphore "github.com/toolkits/concurrent/semaphore"
+	cron "github.com/toolkits/cron"
 	"log"
 	"time"
 )

index/index_update_all_task.go

@@ -3,10 +3,10 @@ package index
 import (
 	"encoding/json"
 	"fmt"
-	cron "github.com/niean/cron"
-	nhttpclient "github.com/niean/gotools/http/httpclient"
 	"github.com/open-falcon/task/g"
 	"github.com/open-falcon/task/proc"
+	cron "github.com/toolkits/cron"
+	nhttpclient "github.com/toolkits/http/httpclient"
 	"io/ioutil"
 	"log"
 	"net/http"

monitor/monitor.go

@@ -3,13 +3,13 @@ package monitor
 import (
 	"bytes"
 	"fmt"
-	ncron "github.com/niean/cron"
-	nsema "github.com/niean/gotools/concurrent/semaphore"
-	nmap "github.com/niean/gotools/container/nmap"
-	nhttpclient "github.com/niean/gotools/http/httpclient"
-	ntime "github.com/niean/gotools/time"
 	"github.com/open-falcon/task/g"
 	"github.com/open-falcon/task/proc"
+	nsema "github.com/toolkits/concurrent/semaphore"
+	nmap "github.com/toolkits/container/nmap"
+	ncron "github.com/toolkits/cron"
+	nhttpclient "github.com/toolkits/http/httpclient"
+	ntime "github.com/toolkits/time"
 	"io/ioutil"
 	"log"
 	"net/http"

proc/proc.go

@@ -1,7 +1,7 @@
 package proc
 
 import (
-	nproc "github.com/niean/gotools/proc"
+	nproc "github.com/toolkits/proc"
 	"log"
 	"time"
 )