Slightly better error message

snoyberg · Oct 21, 2012 · 99739e3 · 99739e3
1 parent 30804ae
commit 99739e3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Keter/App.hs b/Keter/App.hs
@@ -90,7 +90,11 @@ unpackBundle tf bundle appname = do
                     let rest = do
                             unpackTar dir $ Tar.read $ decompress lbs
                             let configFP = dir F.</> "config" F.</> "keter.yaml"
-                            Just config <- decodeFile $ F.encodeString configFP
+                            mconfig <- decodeFile $ F.encodeString configFP
+                            config <-
+                                case mconfig of
+                                    Just config -> return config
+                                    Nothing -> throwIO InvalidConfigFile
                             return (dir, config
                                 { configStaticHosts = Set.fromList
                                                     $ mapMaybe (fixStaticHost dir)

diff --git a/Keter/Prelude.hs b/Keter/Prelude.hs
@@ -288,6 +288,7 @@ instance FromText Blaze.Builder where
 data KeterException = CannotParsePostgres F.FilePath
                     | ExitCodeFailure F.FilePath ExitCode
                     | NoPortsAvailable
+                    | InvalidConfigFile
     deriving (P.Show, Typeable)
 instance E.Exception KeterException
 

diff --git a/Keter/Process.hs b/Keter/Process.hs
@@ -59,7 +59,7 @@ run exec dir args env logger = do
                                 attach logger $ LogPipes pout perr
                                 log $ ProcessCreated exec
                                 return (Running pid, do
-                                    liftIO $ waitForProcess pid `onException` killProcess pid
+                                    _ <- liftIO $ waitForProcess pid `onException` killProcess pid
                                     loop (Just now))
             next
     forkKIO $ loop Nothing