make balls::route echo to stdout

rather than write to the socket directly
jneen · Jan 12, 2011 · aa3d7ed · aa3d7ed
1 parent f35298c
commit aa3d7ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/lib/router.sh b/lib/router.sh
@@ -53,21 +53,20 @@ balls::route() {
         echo "$body"
       )
 
-      echo "$response" >$http_sock
+      echo "$response"
     }
-    # send the headers to the client
     rm -f "$headers_sock"
   else
     if [[ "$REQUEST_METHOD" = "HEAD" ]]; then
       REQUEST_METHOD=GET
       balls::route
     else
-      http::status 404 > $http_sock
-      http::content_type text/plain > $http_sock
-      http::body > $http_sock
+      http::status 404 3>&1
+      http::content_type text/plain 3>&1
+      echo
     fi
 
-    echo "No route matched $REQUEST_METHOD $REQUEST_PATH" > $http_sock
-    echo > $http_sock
+    echo "No route matched $REQUEST_METHOD $REQUEST_PATH"
+    echo
   fi
 }
diff --git a/lib/server.sh b/lib/server.sh
@@ -12,7 +12,7 @@ balls::server() {
   while true; do
     cat $http_sock | nc -l -p $BALLS_PORT | (
       http::parse_request
-      balls::route
+      balls::route > $http_sock
     )
   done
 }