replace panic with runOrThrowIO when parseNodeConfig

Author: Cmdv

cardano-db-sync/src/Cardano/DbSync/Config.hs

@@ -36,6 +36,7 @@ import qualified Data.ByteString.Char8 as BS
 import qualified Data.Text as Text
 import qualified Data.Yaml as Yaml
 import System.FilePath (takeDirectory, (</>))
+import Cardano.DbSync.Error (runOrThrowIO)
 
 configureLogging :: SyncNodeParams -> Text -> IO (Trace IO Text)
 configureLogging params loggingName = do
@@ -49,7 +50,7 @@ configureLogging params loggingName = do
 readSyncNodeConfig :: ConfigFile -> IO SyncNodeConfig
 readSyncNodeConfig (ConfigFile fp) = do
   pcfg <- adjustNodeFilePath . parseSyncPreConfig <$> readByteString fp "DbSync"
-  ncfg <- parseNodeConfig <$> readByteString (pcNodeConfigFilePath pcfg) "node"
+  ncfg <- runOrThrowIO . parseNodeConfig =<< readByteString (pcNodeConfigFilePath pcfg) "node"
   coalesceConfig pcfg ncfg (mkAdjustPath pcfg)
   where
     parseSyncPreConfig :: ByteString -> SyncPreConfig

cardano-db-sync/src/Cardano/DbSync/Config/Node.hs

@@ -15,14 +15,14 @@ module Cardano.DbSync.Config.Node (
 
 import qualified Cardano.Chain.Update as Byron
 import Cardano.Crypto (RequiresNetworkMagic (..))
-import Cardano.Db (textShow)
 import Cardano.DbSync.Config.Types
 import Cardano.Prelude
 import Data.Aeson (FromJSON (..), Object, (.:), (.:?))
 import qualified Data.Aeson as Aeson
 import Data.Aeson.Types (Parser)
 import qualified Data.Yaml as Yaml
 import qualified Ouroboros.Consensus.Cardano.CanHardFork as Shelley
+import Data.String (String)
 
 data NodeConfig = NodeConfig
   { ncProtocol :: !SyncProtocol
@@ -49,11 +49,17 @@ data NodeConfig = NodeConfig
     ncConwayHardFork :: !Shelley.TriggerHardFork
   }
 
-parseNodeConfig :: ByteString -> NodeConfig
+newtype NodeConfigParseError =
+  NodeConfigParseError String
+  deriving (Show)
+
+instance Exception NodeConfigParseError
+
+parseNodeConfig :: ByteString -> IO (Either NodeConfigParseError NodeConfig)
 parseNodeConfig bs =
   case Yaml.decodeEither' bs of
-    Left err -> panic $ "Error parsing node config: " <> textShow err
-    Right nc -> nc
+    Left err -> pure $ Left $ NodeConfigParseError ("Error parsing node config: " <> show err)
+    Right nc -> pure $ Right nc
 
 -- -------------------------------------------------------------------------------------------------