fix the default values of public port/host

Author: zyxkad

cluster.go

@@ -554,20 +554,24 @@ func (cr *Cluster) SyncFiles(ctx context.Context, files []FileInfo, heavyCheck b
 
 type fileInfoWithTargets struct {
 	FileInfo
+	tgMux   sync.Mutex
 	targets []Storage
 }
 
-func (cr *Cluster) checkFileFor(storage Storage, files []FileInfo, heavy bool, missing map[string]*fileInfoWithTargets) {
+func (cr *Cluster) checkFileFor(storage Storage, files []FileInfo, heavy bool, missing *SyncMap[string, *fileInfoWithTargets]) {
 	addMissing := func(f FileInfo) {
-		if info := missing[f.Hash]; info != nil {
-			info.targets = append(info.targets, storage)
-		} else {
-			missing[f.Hash] = &fileInfoWithTargets{
+		if info, has := missing.GetOrSet(f.Hash, func() *fileInfoWithTargets {
+			return &fileInfoWithTargets{
 				FileInfo: f,
 				targets:  []Storage{storage},
 			}
+		}); has {
+			info.tgMux.Lock()
+			info.targets = append(info.targets, storage)
+			info.tgMux.Unlock()
 		}
 	}
+
 	logInfof("Start checking files for %s, heavy = %v", storage.String(), heavy)
 	var buf [1024 * 32]byte
 	for i, f := range files {
@@ -611,30 +615,35 @@ func (cr *Cluster) checkFileFor(storage Storage, files []FileInfo, heavy bool, m
 		}
 		logDebugf("Could not found file %q", hash)
 	MISSING:
-		storage.Remove(f.Hash)
 		addMissing(f)
 	}
-	logInfo("File check finished")
+	logInfo("File check finished for %s", storage.String())
 	return
 }
 
 func (cr *Cluster) syncFiles(ctx context.Context, files []FileInfo, heavyCheck bool) error {
-	missingMap := make(map[string]*fileInfoWithTargets, 4)
+	missingMap := NewSyncMap[string, *fileInfoWithTargets]()
+	var wg sync.WaitGroup
 	for _, s := range cr.storages {
-		cr.checkFileFor(s, files, heavyCheck, missingMap)
-	}
-
-	missing := make([]*fileInfoWithTargets, 0, len(missingMap))
-	for _, f := range missingMap {
-		missing = append(missing, f)
+		wg.Add(1)
+		go func(s Storage) {
+			defer wg.Done()
+			cr.checkFileFor(s, files, heavyCheck, missingMap)
+		}(s)
 	}
+	wg.Wait()
 
-	fl := len(missing)
+	fl := len(missingMap.m)
 	if fl == 0 {
 		logInfo("All oss files was synchronized")
 		return nil
 	}
 
+	missing := make([]*fileInfoWithTargets, 0, len(missingMap.m))
+	for _, f := range missingMap.m {
+		missing = append(missing, f)
+	}
+
 	var stats syncStats
 	stats.fl = fl
 	for _, f := range missing {

config.go

@@ -89,8 +89,8 @@ var defaultConfig = Config{
 	NoOpen:               false,
 	NoHeavyCheck:         false,
 	TrustedXForwardedFor: false,
-	PublicHost:           "example.com",
-	PublicPort:           8080,
+	PublicHost:           "",
+	PublicPort:           0,
 	Port:                 4000,
 	ClusterId:            "${CLUSTER_ID}",
 	ClusterSecret:        "${CLUSTER_SECRET}",

main.go

@@ -312,10 +312,14 @@ START:
 	)
 
 	logInfof("Starting Go-OpenBmclApi v%s (%s)", ClusterVersion, BuildVersion)
+	publicPort := config.PublicPort
+	if publicPort == 0 {
+		publicPort = config.Port
+	}
 	cluster := NewCluster(ctx,
 		"https://openbmclapi.bangbang93.com",
 		baseDir,
-		config.PublicHost, config.PublicPort,
+		config.PublicHost, publicPort,
 		config.ClusterId, config.ClusterSecret,
 		config.Byoc, dialer,
 		config.Storages,
@@ -377,7 +381,7 @@ START:
 			if publicHost == "" {
 				publicHost = config.PublicHost
 			}
-			logInfof("Server public at https://%s:%d (%s)", publicHost, config.PublicPort, clusterSvr.Addr)
+			logInfof("Server public at https://%s:%d (%s)", publicHost, publicPort, clusterSvr.Addr)
 		} else {
 			go func() {
 				defer listener.Close()
@@ -386,7 +390,7 @@ START:
 					os.Exit(1)
 				}
 			}()
-			logInfof("Server public at https://%s:%d (%s)", config.PublicHost, config.PublicPort, clusterSvr.Addr)
+			logInfof("Server public at https://%s:%d (%s)", config.PublicHost, publicPort, clusterSvr.Addr)
 		}
 
 		logInfof("Fetching file list")

util.go

@@ -325,3 +325,56 @@ func initCache(base string) (err error) {
 	}
 	return nil
 }
+
+type SyncMap[K comparable, V any] struct {
+	l sync.RWMutex
+	m map[K]V
+}
+
+func NewSyncMap[K comparable, V any]() *SyncMap[K, V] {
+	return &SyncMap[K, V]{
+		m: make(map[K]V),
+	}
+}
+
+func (m *SyncMap[K, V]) Len() int {
+	m.l.RLock()
+	defer m.l.RUnlock()
+	return len(m.m)
+}
+
+func (m *SyncMap[K, V]) Set(k K, v V) {
+	m.l.Lock()
+	defer m.l.Unlock()
+	m.m[k] = v
+}
+
+func (m *SyncMap[K, V]) Get(k K) V {
+	m.l.RLock()
+	defer m.l.RUnlock()
+	return m.m[k]
+}
+
+func (m *SyncMap[K, V]) Has(k K) bool {
+	m.l.RLock()
+	defer m.l.RUnlock()
+	_, ok := m.m[k]
+	return ok
+}
+
+func (m *SyncMap[K, V]) GetOrSet(k K, setter func() V) (v V, has bool) {
+	m.l.RLock()
+	v, has = m.m[k]
+	m.l.RUnlock()
+	if has {
+		return
+	}
+	m.l.Lock()
+	defer m.l.Unlock()
+	v, has = m.m[k]
+	if !has {
+		v = setter()
+		m.m[k] = v
+	}
+	return
+}