refactor(gatewayserver)

cmd/ipfs-gateway-fs/main.go

@@ -66,6 +66,24 @@ func run() error {
 	defer node.Close()
 
 	if *performGC {
+		if err := runGarbageCollectorWorker(ctx, node); err != nil {
+			return err
+		}
+	}
+
+	if *assetsPath != "" {
+		if err := runFileServerWorker(ctx, node); err != nil {
+			return err
+		}
+	}
+
+	opts := []corehttp.ServeOption{
+		corehttp.GatewayOption(*writable),
+	}
+	return corehttp.ListenAndServe(node, *host, opts...)
+}
+
+func runGarbageCollectorWorker(ctx context.Context, node *core.IpfsNode) error {
 	go func() {
 		for _ = range time.Tick(*garbageCollectInterval) {
 			if err := corerepo.GarbageCollect(node, ctx); err != nil {
@@ -73,9 +91,10 @@ func run() error {
 			}
 		}
 	}()
-	}
+	return nil
+}
 
-	if *assetsPath != "" {
+func runFileServerWorker(ctx context.Context, node *core.IpfsNode) error {
 	fi, err := os.Stat(*assetsPath)
 	if err != nil {
 		return err
@@ -91,13 +110,5 @@ func run() error {
 			}
 		}
 	}()
-	}
-
-	opts := []corehttp.ServeOption{
-		corehttp.GatewayOption(*writable),
-	}
-	if err := corehttp.ListenAndServe(node, *host, opts...); err != nil {
-		return err
-	}
 	return nil
 }