Merge branch 'develop'

docker-compose.base.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
     redis:
-        image: redis:3.0-alpine
+        image: redis:3.2-32bit
         volumes:
             - ./data/redis:/data
 

lib/external/accounts/base.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 )
 
-const domain = "https://dev.account.ely.by"
+const domain = "https://account.ely.by"
 
 var Client = &http.Client{}
 

lib/tools/tools.go

@@ -30,7 +30,12 @@ func BuildKey(username string) string {
 }
 
 func BuildElyUrl(route string) string {
-	return "http://ely.by" + route
+	prefix := "http://ely.by"
+	if !strings.HasPrefix(route, prefix) {
+		route = prefix + route
+	}
+
+	return route
 }
 
 func getCurrentHour() int64 {

lib/tools/tools_test.go

@@ -20,3 +20,13 @@ func TestBuildKey(t *testing.T) {
 		t.Error("Function shound convert string to lower case and concatenate it with usernmae:")
 	}
 }
+
+func TestBuildElyUrl(t *testing.T) {
+	if BuildElyUrl("/route") != "http://ely.by/route" {
+		t.Error("Function should add prefix to the provided relative url.")
+	}
+
+	if BuildElyUrl("http://ely.by/test/route") != "http://ely.by/test/route" {
+		t.Error("Function should do not add prefix to the provided prefixed url.")
+	}
+}

lib/worker/supports.go

@@ -42,8 +42,10 @@ func _getByField(field string, value string) (accounts.AccountInfoResponse, erro
 
 func getToken() (*accounts.Token, error) {
 	if token == nil {
+		println("token is nil, trying to obtain new one")
 		tempToken, err := accounts.GetToken(*AccountsTokenConfig)
 		if err != nil {
+			println("cannot obtain new one token", err)
 			return &accounts.Token{}, err
 		}
 

minecraft-skinsystem.go

@@ -77,7 +77,6 @@ func main() {
 
 	// statsd
 	var statsdString = os.Getenv("STATSD_ADDR")
-	statsdString = ""
 	if (statsdString != "") {
 		log.Println("Connecting to statsd")
 		hostname, _ := os.Hostname()