Merge pull request #9 from 8fold/working

bad gateway (502) seemed inappropriate
8fold · Oct 28, 2021 · 523d0b8 · 523d0b8
2 parents ec49f32 + 9daa5ed
commit 523d0b8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/public/index.php b/public/index.php
@@ -45,7 +45,7 @@
 );
 
 if ($content->folderIsMissing()) {
-    JoshBruce\Site\Emitter::emitBadGatewayResponse(
+    JoshBruce\Site\Emitter::emitBadContentResponse(
         $markdownConverter,
         $projectRoot
     );
@@ -71,14 +71,7 @@
 }
 
 if ($server->isRequestingFile()) {
-    JoshBruce\Site\Emitter::emitWithResponseFile(
-        200,
-        [
-            'Cache-Control' => ['max-age=2592000'],
-            'Content-Type'  => $content->mimeType()
-        ],
-        $content->filePath()
-    );
+    JoshBruce\Site\Emitter::emitFile($content->mimeType(), $content->filePath());
     exit;
 }
 

diff --git a/setup-errors/502.md → setup-errors/500_2.md b/setup-errors/502.md → setup-errors/500_2.md
@@ -1,9 +1,9 @@
 ---
-title: Content error
+title: Server error
 usage: The folder containing the site content could not be located.
 ---
 
-# 502: Bad gateway (content)
+# 500: Server error (content)
 
 We're not sure what happened here but we're pretty sure it's on us.
 

diff --git a/src/Emitter.php b/src/Emitter.php
@@ -50,6 +50,18 @@ public static function emit(PsrResponse $response): void
         $emitter->emit($response);
     }
 
+    public static function emitFile(string $mimeType, string $filePath): void
+    {
+        self::emitWithResponseFile(
+            200,
+            [
+                'Cache-Control' => ['max-age=2592000'],
+                'Content-Type'  => $mimeType
+            ],
+            $filePath
+        );
+    }
+
     public static function emitInterServerErrorResponse(
         Markdown $converter,
         string $projectRoot
@@ -98,12 +110,12 @@ public static function emitUnsupportedMethodResponse(
         );
     }
 
-    public static function emitBadGatewayResponse(
+    public static function emitBadContentResponse(
         Markdown $converter,
         string $projectRoot
     ): void {
         $content = Content::init($projectRoot, 0, '/setup-errors')
-            ->for('/502.md');
+            ->for('/500.md');
 
         self::emitWithResponse(
             502,