Revert "git-fcgi: add buffering proxy to quickly read from fcgi"

shankerwangmiao · shankerwangmiao · commit 0521cf7a7dfa · 2026-03-17T02:34:19.000+08:00
This reverts commit c9dcd12.
diff --git a/git-fcgi/Dockerfile b/git-fcgi/Dockerfile
@@ -5,9 +5,7 @@ RUN apt-get update && \
 RUN mkdir -p /app
 WORKDIR /app
 COPY go-queue.go /app/
-COPY buffering-proxy.go /app/
 RUN CGO_ENABLED=0 go build -o go-queue go-queue.go
-RUN CGO_ENABLED=0 go build -o buffering-proxy buffering-proxy.go
 
 FROM debian:bookworm
 LABEL maintainer="Justin Wong <yuzhi.wang@tuna.tsinghua.edu.cn>"
@@ -25,7 +23,6 @@ COPY queue-wrapper.sh /queue-wrapper.sh
 RUN mkdir -p /data
 
 COPY --from=builder --chown=0:0 /app/go-queue /go-queue
-COPY --from=builder --chown=0:0 /app/buffering-proxy /buffering-proxy
 
 EXPOSE 5000
 CMD [ "/cmd.sh" ]
diff --git a/git-fcgi/buffering-proxy.go b/git-fcgi/buffering-proxy.go
diff --git a/git-fcgi/cmd.sh b/git-fcgi/cmd.sh
@@ -2,18 +2,10 @@
 
 THREADS=${THREADS:-"64"}
 QUEUE_SIZE=${QUEUE_SIZE:-"48"}
-MAX_BUFFER_SIZE=${MAX_BUFFER_SIZE:-"1G"}
-BUFFER_PATH=${BUFFER_PATH:-"/tmp"}
-
 export HOME=/var/www
 (
     while true; do
         /go-queue --queue-size "${QUEUE_SIZE}" --port-number 8888
     done
 )&
-(
-    while true; do
-        /buffering-proxy --listen ":5000" --max-buffer-size "${MAX_BUFFER_SIZE}" --on-disk-buffer-path "${BUFFER_PATH}" --upstream "unix:/tmp/fcgi.sock"
-    done
-)&
-exec /usr/bin/spawn-fcgi -u www-data -g www-data -s /tmp/fcgi.sock -n -- /usr/bin/multiwatch -f "${THREADS}" -- /usr/sbin/fcgiwrap
+exec /usr/bin/spawn-fcgi -u www-data -g www-data -p 5000 -n -- /usr/bin/multiwatch -f ${THREADS} -- /usr/sbin/fcgiwrap
