chore: update dependency sirupsen/logrus@v1.0.6

The logrus need indirect dependencies as follows: - `golang.org/x/crypto/ssh/terminal` - `golang.org/x/sys/unix` So, resolve them. The next to update `github.com/masato25/yaag/gin` due to the use `sirupsen/logrus`. Why is `v1.0.6`? Just for compatibility with go1.6. Closes open-falcon#818
shaneing · Oct 28, 2019 · 17dce73 · 17dce73
1 parent fa81b78
commit 17dce73
Show file tree

Hide file tree

Showing 288 changed files with 64,802 additions and 27,653 deletions.
diff --git a/modules/agent/funcs/dfstat.go b/modules/agent/funcs/dfstat.go
@@ -16,9 +16,9 @@ package funcs
 
 import (
 	"fmt"
-	log "github.com/Sirupsen/logrus"
 	"github.com/open-falcon/falcon-plus/common/model"
 	"github.com/open-falcon/falcon-plus/modules/agent/g"
+	log "github.com/sirupsen/logrus"
 	"github.com/toolkits/nux"
 )
 

diff --git a/modules/agent/g/logger.go b/modules/agent/g/logger.go
@@ -14,7 +14,7 @@
 
 package g
 
-import log "github.com/Sirupsen/logrus"
+import log "github.com/sirupsen/logrus"
 
 func InitLog(level string) (err error) {
 	switch level {

diff --git a/modules/alarm/api/portal.go b/modules/alarm/api/portal.go
@@ -17,8 +17,8 @@ package api
 import (
 	"encoding/json"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
 	"github.com/open-falcon/falcon-plus/modules/alarm/g"
+	log "github.com/sirupsen/logrus"
 	"github.com/toolkits/net/httplib"
 	"sync"
 	"time"

diff --git a/modules/alarm/api/uic.go b/modules/alarm/api/uic.go
@@ -17,9 +17,9 @@ package api
 import (
 	"encoding/json"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
 	"github.com/open-falcon/falcon-plus/modules/alarm/g"
 	"github.com/open-falcon/falcon-plus/modules/api/app/model/uic"
+	log "github.com/sirupsen/logrus"
 	"github.com/toolkits/container/set"
 	"github.com/toolkits/net/httplib"
 	"strings"

diff --git a/modules/alarm/api/uic_test.go b/modules/alarm/api/uic_test.go
@@ -17,8 +17,8 @@ package api
 import (
 	"testing"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/open-falcon/falcon-plus/modules/alarm/g"
+	log "github.com/sirupsen/logrus"
 	. "github.com/smartystreets/goconvey/convey"
 )
 

diff --git a/modules/alarm/cron/callback.go b/modules/alarm/cron/callback.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/open-falcon/falcon-plus/common/model"
 	"github.com/open-falcon/falcon-plus/common/utils"

diff --git a/modules/alarm/cron/combiner.go b/modules/alarm/cron/combiner.go
@@ -17,11 +17,11 @@ package cron
 import (
 	"encoding/json"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
 	"github.com/garyburd/redigo/redis"
 	"github.com/open-falcon/falcon-plus/modules/alarm/api"
 	"github.com/open-falcon/falcon-plus/modules/alarm/g"
 	"github.com/open-falcon/falcon-plus/modules/alarm/redi"
+	log "github.com/sirupsen/logrus"
 	"strings"
 	"time"
 )

diff --git a/modules/alarm/cron/event_consumer.go b/modules/alarm/cron/event_consumer.go
@@ -16,7 +16,7 @@ package cron
 
 import (
 	"encoding/json"
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	cmodel "github.com/open-falcon/falcon-plus/common/model"
 	"github.com/open-falcon/falcon-plus/modules/alarm/api"

diff --git a/modules/alarm/cron/event_reader.go b/modules/alarm/cron/event_reader.go
@@ -18,11 +18,11 @@ import (
 	"encoding/json"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/garyburd/redigo/redis"
 	cmodel "github.com/open-falcon/falcon-plus/common/model"
 	"github.com/open-falcon/falcon-plus/modules/alarm/g"
 	eventmodel "github.com/open-falcon/falcon-plus/modules/alarm/model/event"
+	log "github.com/sirupsen/logrus"
 )
 
 func ReadHighEvent() {

diff --git a/modules/alarm/cron/im_sender.go b/modules/alarm/cron/im_sender.go
@@ -15,10 +15,10 @@
 package cron
 
 import (
-	log "github.com/Sirupsen/logrus"
 	"github.com/open-falcon/falcon-plus/modules/alarm/g"
 	"github.com/open-falcon/falcon-plus/modules/alarm/model"
 	"github.com/open-falcon/falcon-plus/modules/alarm/redi"
+	log "github.com/sirupsen/logrus"
 	"github.com/toolkits/net/httplib"
 	"time"
 )

diff --git a/modules/alarm/cron/mail_sender.go b/modules/alarm/cron/mail_sender.go
@@ -15,10 +15,10 @@
 package cron
 
 import (
-	log "github.com/Sirupsen/logrus"
 	"github.com/open-falcon/falcon-plus/modules/alarm/g"
 	"github.com/open-falcon/falcon-plus/modules/alarm/model"
 	"github.com/open-falcon/falcon-plus/modules/alarm/redi"
+	log "github.com/sirupsen/logrus"
 	"github.com/toolkits/net/httplib"
 	"time"
 )

diff --git a/modules/alarm/cron/sms_sender.go b/modules/alarm/cron/sms_sender.go
@@ -15,10 +15,10 @@
 package cron
 
 import (
-	log "github.com/Sirupsen/logrus"
 	"github.com/open-falcon/falcon-plus/modules/alarm/g"
 	"github.com/open-falcon/falcon-plus/modules/alarm/model"
 	"github.com/open-falcon/falcon-plus/modules/alarm/redi"
+	log "github.com/sirupsen/logrus"
 	"github.com/toolkits/net/httplib"
 	"strings"
 	"time"

diff --git a/modules/alarm/g/logger.go b/modules/alarm/g/logger.go
@@ -14,7 +14,7 @@
 
 package g
 
-import log "github.com/Sirupsen/logrus"
+import log "github.com/sirupsen/logrus"
 
 func InitLog(level string) (err error) {
 	switch level {

diff --git a/modules/alarm/model/event/event_operation.go b/modules/alarm/model/event/event_operation.go
@@ -20,10 +20,10 @@ import (
 
 	"database/sql"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/astaxie/beego/orm"
 	coommonModel "github.com/open-falcon/falcon-plus/common/model"
 	"github.com/open-falcon/falcon-plus/common/utils"
+	log "github.com/sirupsen/logrus"
 )
 
 const timeLayout = "2006-01-02 15:04:05"

diff --git a/modules/alarm/redi/msg_reader.go b/modules/alarm/redi/msg_reader.go
@@ -16,10 +16,10 @@ package redi
 
 import (
 	"encoding/json"
-	log "github.com/Sirupsen/logrus"
 	"github.com/garyburd/redigo/redis"
 	"github.com/open-falcon/falcon-plus/modules/alarm/g"
 	"github.com/open-falcon/falcon-plus/modules/alarm/model"
+	log "github.com/sirupsen/logrus"
 )
 
 const (

diff --git a/modules/alarm/redi/msg_writer.go b/modules/alarm/redi/msg_writer.go
@@ -16,7 +16,7 @@ package redi
 
 import (
 	"encoding/json"
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"strings"
 
 	"github.com/open-falcon/falcon-plus/modules/alarm/g"

diff --git a/modules/api/app/controller/graph/grafana_controller.go b/modules/api/app/controller/graph/grafana_controller.go
@@ -18,12 +18,12 @@ import (
 	"regexp"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/emirpasic/gods/maps/hashmap"
 	"github.com/gin-gonic/gin"
 	cmodel "github.com/open-falcon/falcon-plus/common/model"
 	h "github.com/open-falcon/falcon-plus/modules/api/app/helper"
 	m "github.com/open-falcon/falcon-plus/modules/api/app/model/graph"
+	log "github.com/sirupsen/logrus"
 )
 
 type APIGrafanaMainQueryInputs struct {

diff --git a/modules/api/app/controller/graph/graph_controller.go b/modules/api/app/controller/graph/graph_controller.go
@@ -21,14 +21,14 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
 	"github.com/jinzhu/gorm"
 	cmodel "github.com/open-falcon/falcon-plus/common/model"
 	h "github.com/open-falcon/falcon-plus/modules/api/app/helper"
 	m "github.com/open-falcon/falcon-plus/modules/api/app/model/graph"
 	"github.com/open-falcon/falcon-plus/modules/api/app/utils"
 	grh "github.com/open-falcon/falcon-plus/modules/api/graph"
+	log "github.com/sirupsen/logrus"
 	tcache "github.com/toolkits/cache/localcache/timedcache"
 	"net/http"
 )

diff --git a/modules/api/app/controller/host/aggreator_controller.go b/modules/api/app/controller/host/aggreator_controller.go
@@ -18,11 +18,11 @@ import (
 	"fmt"
 	"strconv"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
 	"github.com/jinzhu/gorm"
 	h "github.com/open-falcon/falcon-plus/modules/api/app/helper"
 	f "github.com/open-falcon/falcon-plus/modules/api/app/model/falcon_portal"
+	log "github.com/sirupsen/logrus"
 )
 
 func GetAggregatorListOfGrp(c *gin.Context) {

diff --git a/modules/api/app/controller/host/host_controller.go b/modules/api/app/controller/host/host_controller.go
@@ -18,11 +18,11 @@ import (
 	"fmt"
 	"strconv"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
 	h "github.com/open-falcon/falcon-plus/modules/api/app/helper"
 	f "github.com/open-falcon/falcon-plus/modules/api/app/model/falcon_portal"
 	u "github.com/open-falcon/falcon-plus/modules/api/app/utils"
+	log "github.com/sirupsen/logrus"
 )
 
 func GetHostBindToWhichHostGroup(c *gin.Context) {

diff --git a/modules/api/app/controller/host/hostgroup_controller.go b/modules/api/app/controller/host/hostgroup_controller.go
@@ -20,12 +20,12 @@ import (
 	"regexp"
 	"strconv"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
 	"github.com/jinzhu/gorm"
 	h "github.com/open-falcon/falcon-plus/modules/api/app/helper"
 	f "github.com/open-falcon/falcon-plus/modules/api/app/model/falcon_portal"
 	u "github.com/open-falcon/falcon-plus/modules/api/app/utils"
+	log "github.com/sirupsen/logrus"
 )
 
 func GetHostGroups(c *gin.Context) {

diff --git a/modules/api/app/controller/host/plugins_controller.go b/modules/api/app/controller/host/plugins_controller.go
@@ -18,10 +18,10 @@ import (
 	"fmt"
 	"strconv"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
 	h "github.com/open-falcon/falcon-plus/modules/api/app/helper"
 	f "github.com/open-falcon/falcon-plus/modules/api/app/model/falcon_portal"
+	log "github.com/sirupsen/logrus"
 )
 
 type APICreatePluginInput struct {

diff --git a/modules/api/app/controller/template/template_controller.go b/modules/api/app/controller/template/template_controller.go
@@ -18,11 +18,11 @@ import (
 	"fmt"
 	"strconv"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
 	"github.com/jinzhu/gorm"
 	h "github.com/open-falcon/falcon-plus/modules/api/app/helper"
 	f "github.com/open-falcon/falcon-plus/modules/api/app/model/falcon_portal"
+	log "github.com/sirupsen/logrus"
 )
 
 type APIGetTemplatesOutput struct {

diff --git a/modules/api/app/controller/uic/session_controller.go b/modules/api/app/controller/uic/session_controller.go
@@ -18,11 +18,11 @@ import (
 	"net/http"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
 	h "github.com/open-falcon/falcon-plus/modules/api/app/helper"
 	"github.com/open-falcon/falcon-plus/modules/api/app/model/uic"
 	"github.com/open-falcon/falcon-plus/modules/api/app/utils"
+	log "github.com/sirupsen/logrus"
 )
 
 type APILoginInput struct {

diff --git a/modules/api/app/controller/uic/team_controller.go b/modules/api/app/controller/uic/team_controller.go
@@ -20,12 +20,12 @@ import (
 	"net/http"
 	"strconv"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
 	"github.com/jinzhu/gorm"
 	h "github.com/open-falcon/falcon-plus/modules/api/app/helper"
 	"github.com/open-falcon/falcon-plus/modules/api/app/model/uic"
 	"github.com/open-falcon/falcon-plus/modules/api/config"
+	log "github.com/sirupsen/logrus"
 )
 
 type CTeam struct {

diff --git a/modules/api/app/controller/uic/user_controller.go b/modules/api/app/controller/uic/user_controller.go
@@ -21,12 +21,12 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
 	"github.com/jinzhu/gorm"
 	h "github.com/open-falcon/falcon-plus/modules/api/app/helper"
 	"github.com/open-falcon/falcon-plus/modules/api/app/model/uic"
 	"github.com/open-falcon/falcon-plus/modules/api/app/utils"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 )
 

diff --git a/modules/api/app/helper/session.go b/modules/api/app/helper/session.go
@@ -19,7 +19,7 @@ import (
 
 	"encoding/json"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/gin-gonic/gin"
 	"github.com/open-falcon/falcon-plus/modules/api/app/model/uic"

diff --git a/modules/api/app/helper/simple_reponse.go b/modules/api/app/helper/simple_reponse.go
@@ -18,8 +18,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 )
 

diff --git a/modules/api/app/model/falcon_portal/tpl.go b/modules/api/app/model/falcon_portal/tpl.go
@@ -15,9 +15,9 @@
 package falcon_portal
 
 import (
-	log "github.com/Sirupsen/logrus"
 	"github.com/open-falcon/falcon-plus/modules/api/app/model/uic"
 	con "github.com/open-falcon/falcon-plus/modules/api/config"
+	log "github.com/sirupsen/logrus"
 )
 
 type Template struct {

diff --git a/modules/api/app/utils/auth_middle.go b/modules/api/app/utils/auth_middle.go
@@ -17,9 +17,9 @@ package utils
 import (
 	"net/http"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
 	h "github.com/open-falcon/falcon-plus/modules/api/app/helper"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 )
 

diff --git a/modules/api/app/utils/passwd_hash.go b/modules/api/app/utils/passwd_hash.go
@@ -15,7 +15,7 @@
 package utils
 
 import (
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	"github.com/toolkits/str"
 )

diff --git a/modules/api/app/utils/set.go b/modules/api/app/utils/set.go
@@ -19,7 +19,7 @@ import (
 	"strconv"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
 func UniqSet(list []interface{}) []interface{} {

diff --git a/modules/api/config/logger.go b/modules/api/config/logger.go
@@ -14,7 +14,7 @@
 
 package config
 
-import log "github.com/Sirupsen/logrus"
+import log "github.com/sirupsen/logrus"
 
 func InitLog(level string) (err error) {
 	switch level {

diff --git a/modules/api/graph/graph.go b/modules/api/graph/graph.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	backend "github.com/open-falcon/falcon-plus/common/backend_pool"
 	cmodel "github.com/open-falcon/falcon-plus/common/model"