Merge branch 'master' into ely

CHANGELOG.md

@@ -4,11 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased] - xxxx-xx-xx
-
-## [4.2.2] - 2019-06-19
-### Fixed
-- GC for in-memory textures cache has not been initialized.
+## [Unreleased]
 
 ## [4.2.1] - 2019-05-06
 ### Changed
@@ -61,7 +57,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   from the textures link instead.
 - `hash` field from `POST /api/skins` endpoint.
 
-[Unreleased]: https://github.com/elyby/chrly/compare/4.2.2...HEAD
-[4.2.2]: https://github.com/elyby/chrly/compare/4.2.1...4.2.2
+[Unreleased]: https://github.com/elyby/chrly/compare/4.2.1...HEAD
 [4.2.1]: https://github.com/elyby/chrly/compare/4.2.0...4.2.1
 [4.2.0]: https://github.com/elyby/chrly/compare/4.1.1...4.2.0

api/mojang/queue/in_memory_textures_storage.go

@@ -25,11 +25,9 @@ type inMemoryTexturesStorage struct {
 }
 
 func CreateInMemoryTexturesStorage() *inMemoryTexturesStorage {
-	storage := &inMemoryTexturesStorage{
+	return &inMemoryTexturesStorage{
 		data: make(map[string]*inMemoryItem),
 	}
-
-	return storage
 }
 
 func (s *inMemoryTexturesStorage) Start() {

cmd/serve.go

@@ -51,13 +51,11 @@ var serveCmd = &cobra.Command{
 			return
 		}
 
-		texturesStorage := queue.CreateInMemoryTexturesStorage()
-		texturesStorage.Start()
 		mojangTexturesQueue := &queue.JobsQueue{
 			Logger: logger,
 			Storage: &queue.SplittedStorage{
 				UuidsStorage:    mojangUuidsRepository,
-				TexturesStorage: texturesStorage,
+				TexturesStorage: queue.CreateInMemoryTexturesStorage(),
 			},
 		}
 		logger.Info("Mojang's textures queue is successfully initialized")

http/not_found.go

@@ -9,6 +9,7 @@ func (cfg *Config) NotFound(response http.ResponseWriter, request *http.Request)
 	data, _ := json.Marshal(map[string]string{
 		"status":  "404",
 		"message": "Not Found",
+		"link": "http://docs.ely.by/skin-system.html",
 	})
 
 	response.Header().Set("Content-Type", "application/json")

http/not_found_test.go

@@ -22,6 +22,7 @@ func TestConfig_NotFound(t *testing.T) {
 	response, _ := ioutil.ReadAll(resp.Body)
 	assert.JSONEq(`{
 		"status": "404",
-		"message": "Not Found"
+		"message": "Not Found",
+		"link": "http://docs.ely.by/skin-system.html"
 	}`, string(response))
 }

http/signed_textures.go

@@ -39,8 +39,8 @@ func (cfg *Config) SignedTextures(response http.ResponseWriter, request *http.Re
 	}
 
 	responseData.Props = append(responseData.Props, &mojang.Property{
-		Name:  "chrly",
-		Value: "how do you tame a horse in Minecraft?",
+		Name:  "ely",
+		Value: "but why are you asking?",
 	})
 
 	responseJson, _ := json.Marshal(responseData)

http/signed_textures_test.go

@@ -42,8 +42,8 @@ func TestConfig_SignedTextures(t *testing.T) {
 					"value": "mocked textures base64"
 				},
 				{
-					"name": "chrly",
-					"value": "how do you tame a horse in Minecraft?"
+					"name": "ely",
+					"value": "but why are you asking?"
 				}
 			]
 		}`, string(response))
@@ -132,8 +132,8 @@ func TestConfig_SignedTextures(t *testing.T) {
 					"value": "eyJ0aW1lc3RhbXAiOjE1NTYzOTg1NzIsInByb2ZpbGVJZCI6IjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwIiwicHJvZmlsZU5hbWUiOiJtb2NrX3VzZXIiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly9tb2phbmcvc2tpbi5wbmcifX19"
 				},
 				{
-					"name": "chrly",
-					"value": "how do you tame a horse in Minecraft?"
+					"name": "ely",
+					"value": "but why are you asking?"
 				}
 			]
 		}`, string(response))