Merge pull request #92 from wo10378931/master

FIX redis连接问题

backend/conf/config.yml

@@ -7,8 +7,10 @@ mongo:
   username: ""
   password: ""
 redis:
-  network: tcp
-  address: "localhost:6379"
+  address: 127.0.0.1
+  password: redis-1.0
+  database: 1
+  port: 6379
 log:
   level: info
   path: "/var/logs/crawlab"

backend/database/redis.go

@@ -103,10 +103,18 @@ func (r *Redis) HKeys(collection string) ([]string, error) {
 }
 
 func GetRedisConn() (redis.Conn, error) {
-	c, err := redis.Dial(
-		viper.GetString("redis.network"),
-		viper.GetString("redis.address"),
-	)
+	var address = viper.GetString("redis.address")
+	var port = viper.GetString("redis.port")
+	var database = viper.GetString("redis.database")
+	var password = viper.GetString("redis.password")
+
+	var url string
+	if password == "" {
+		url = "redis://" + address + ":" + port + "/" + database
+	} else {
+		url = "redis://x:" + password + "@" + address + ":" + port + "/" + database
+	}
+	c, err := redis.DialURL(url)
 	if err != nil {
 		debug.PrintStack()
 		return c, err