Просмотр исходного кода

Bug webui search order (#253)

* bugfix: Search order of webui directories was not deterministic

* bugfix: webui dir search order was not deterministic

* bugfix: webui dir search order was not deterministic

* bugfix: webui dir search order was not deterministic
James Read 2 лет назад
Родитель
Сommit
a8c4db197d
1 измененных файлов с 5 добавлено и 1 удалено
  1. 5 1
      internal/httpservers/webuiServer.go

+ 5 - 1
internal/httpservers/webuiServer.go

@@ -33,7 +33,11 @@ func findWebuiDir() string {
 		"/etc/OliveTin/webui/",
 	}
 
-	for _, dir := range directoriesToSearch {
+	// Use a classic i := 0 style for loop here instead of range, as the
+	// search order must be deterministic - the order that the slice was defined in.
+	for i := 0; i < len(directoriesToSearch); i++ {
+		dir := directoriesToSearch[i]
+
 		if _, err := os.Stat(dir); !os.IsNotExist(err) {
 			log.WithFields(log.Fields{
 				"dir": dir,